New issue
Advanced search Search tips
Note: Color blocks (like █ or █) mean that a user may not be available. Tooltip shows the reason.

Issue 815230 link

Starred by 2 users
Status: Available
Owner: ----
Cc:
jam@chromium.org
█ ranj@chromium.org
rockot@google.com
yfried...@chromium.org
Components:
EstimatedDays: ----
NextAction: ----
OS: ----
Pri: 2
Type: Bug

Blocking:
issue 729596



Sign in to add a comment

ServiceManager loads services asynchronously.

Project Member Reported by hanxi@chromium.org, Feb 23 2018 
The service initialization in the ServiceManager requires loading service manifests from .pak files. Therefore, the ServiceManager should be able to cache requests during service initialization, and call the callbacks after service initialization is complete.
Project Member

Comment 1 by bugdroid1@chromium.org, Apr 27 2018 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/13dfb3270d72c4b826e4f03b8178b22dd81a158f

commit 13dfb3270d72c4b826e4f03b8178b22dd81a158f
Author: Ran Ji <ranj@chromium.org>
Date: Fri Apr 27 20:39:25 2018

Load resources.pak earlier in service manager main

We need to use the content in resources.pak in service manager, but at
that time resource bundle has not been initialized. Create data pack to
load resources.pak and append the data pack to resource bundle during the
initialization.

Move path FILE_RESOURCES_PACK from chrome_paths.h to ui_base_paths.cc.

Bug: 729596, 815230
Change-Id: Iec3a9409cbd9c10775afb72944e66e26650f1181
Reviewed-on: https://chromium-review.googlesource.com/962679
Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
Reviewed-by: Ken Rockot <rockot@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Xi Han <hanxi@chromium.org>
Commit-Queue: Ran Ji <ranj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554500}
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/app/chrome_main_delegate.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/app/chrome_main_delegate.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_android.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_android.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_linux.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_linux.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_mac.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_mac.mm
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_posix.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_posix.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_win.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_browser_main_win.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/chrome/browser/chromeos/chrome_browser_main_chromeos.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/content/app/content_service_manager_main_delegate.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/content/app/content_service_manager_main_delegate.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/content/public/app/content_main_delegate.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/content/public/app/content_main_delegate.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/services/service_manager/embedder/main.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/services/service_manager/embedder/main_delegate.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/ui/base/resource/resource_bundle.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/ui/base/resource/resource_bundle.h
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/ui/base/resource/resource_bundle_android.cc
[modify] https://crrev.com/13dfb3270d72c4b826e4f03b8178b22dd81a158f/ui/base/resource/resource_bundle_android.h
Project Member

Comment 2 by bugdroid1@chromium.org, Apr 28 2018 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a14a8cd970f00bac9104362997eb8273d188baf3

commit a14a8cd970f00bac9104362997eb8273d188baf3
Author: John Budorick <jbudorick@chromium.org>
Date: Sat Apr 28 01:35:12 2018

Revert "Load resources.pak earlier in service manager main"

This reverts commit 13dfb3270d72c4b826e4f03b8178b22dd81a158f.

Reason for revert: Suspected cause of many test failures in https://luci-milo.appspot.com/p/chromium/builders/luci.chromium.ci/Linux%20Tests%20%28dbg%29%281%29/71676

Original change's description:
> Load resources.pak earlier in service manager main
> 
> We need to use the content in resources.pak in service manager, but at
> that time resource bundle has not been initialized. Create data pack to
> load resources.pak and append the data pack to resource bundle during the
> initialization.
> 
> Move path FILE_RESOURCES_PACK from chrome_paths.h to ui_base_paths.cc.
> 
> Bug: 729596, 815230
> Change-Id: Iec3a9409cbd9c10775afb72944e66e26650f1181
> Reviewed-on: https://chromium-review.googlesource.com/962679
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: Ken Rockot <rockot@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Xi Han <hanxi@chromium.org>
> Commit-Queue: Ran Ji <ranj@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#554500}

TBR=sky@chromium.org,yfriedman@chromium.org,rockot@chromium.org,hanxi@chromium.org,ranj@chromium.org

Change-Id: Ia23016b542b772581096492898b57f6c6ed3e075
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 729596, 815230
Reviewed-on: https://chromium-review.googlesource.com/1034132
Reviewed-by: John Budorick <jbudorick@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554603}
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/app/chrome_main_delegate.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/app/chrome_main_delegate.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_android.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_android.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_linux.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_linux.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_mac.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_mac.mm
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_posix.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_posix.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_win.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_browser_main_win.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/chrome/browser/chromeos/chrome_browser_main_chromeos.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/content/app/content_service_manager_main_delegate.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/content/app/content_service_manager_main_delegate.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/content/public/app/content_main_delegate.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/content/public/app/content_main_delegate.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/services/service_manager/embedder/main.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/services/service_manager/embedder/main_delegate.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/ui/base/resource/resource_bundle.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/ui/base/resource/resource_bundle.h
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/ui/base/resource/resource_bundle_android.cc
[modify] https://crrev.com/a14a8cd970f00bac9104362997eb8273d188baf3/ui/base/resource/resource_bundle_android.h
Project Member

Comment 3 by bugdroid1@chromium.org, May 2 2018 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/a96d43d4bd51f65d1736887e05b8862a81ec02be

commit a96d43d4bd51f65d1736887e05b8862a81ec02be
Author: Ran Ji <ranj@chromium.org>
Date: Wed May 02 17:14:53 2018

Load resources.pak earlier in content_main_runner

Reland "Load resources.pak earlier in service manager main"

This is a reland of 13dfb3270d72c4b826e4f03b8178b22dd81a158f

Original change's description:
> Load resources.pak earlier in service manager main
>
> We need to use the content in resources.pak in service manager, but at
> that time resource bundle has not been initialized. Create data pack to
> load resources.pak and append the data pack to resource bundle during the
> initialization.
>
> Move path FILE_RESOURCES_PACK from chrome_paths.h to ui_base_paths.cc.
>
> Bug: 729596, 815230
> Change-Id: Iec3a9409cbd9c10775afb72944e66e26650f1181
> Reviewed-on: https://chromium-review.googlesource.com/962679
> Reviewed-by: Yaron Friedman <yfriedman@chromium.org>
> Reviewed-by: Ken Rockot <rockot@chromium.org>
> Reviewed-by: Scott Violet <sky@chromium.org>
> Reviewed-by: Xi Han <hanxi@chromium.org>
> Commit-Queue: Ran Ji <ranj@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#554500}

Bug: 729596, 815230
Change-Id: Id963d1e64c70a22a29e94d8186ea0d4bcb1455fd

TBR=sky@chromium.org, yfriedman@chromium.org, rockot@chromium.org

Change-Id: Id963d1e64c70a22a29e94d8186ea0d4bcb1455fd
Reviewed-on: https://chromium-review.googlesource.com/1034133
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Xi Han <hanxi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555443}
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/app/chrome_main_delegate.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/app/chrome_main_delegate.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_android.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_android.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_linux.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_linux.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_mac.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_mac.mm
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_posix.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_posix.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_win.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_browser_main_win.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/chrome/browser/chromeos/chrome_browser_main_chromeos.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/content/app/content_main_runner.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/content/public/app/content_main_delegate.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/content/public/app/content_main_delegate.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/ui/base/resource/resource_bundle.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/ui/base/resource/resource_bundle.h
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/ui/base/resource/resource_bundle_android.cc
[modify] https://crrev.com/a96d43d4bd51f65d1736887e05b8862a81ec02be/ui/base/resource/resource_bundle_android.h

Comment 4 by roc...@chromium.org, Oct 17

Cc: -roc...@chromium.org rockot@google.com
Project Member

Comment 5 by bugdroid1@chromium.org, Oct 26 

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/713b82e7bdb4d4fe94898b29dea613746ecb9f52

commit 713b82e7bdb4d4fe94898b29dea613746ecb9f52
Author: Xi Han <hanxi@google.com>
Date: Fri Oct 26 00:20:44 2018

Remove code that loads resources.pak earlier.

This was introduce in https://crrev.com/c/1034133. In the follow up CL, we plan
to create the entire ResouceBundle earlier, not just loading the DataPack which
contains the service manifests earlier.

Bug: 815230
Change-Id: I64b12d5f7d28c5aa51678bd077415ddc8155a0e4
Reviewed-on: https://chromium-review.googlesource.com/c/1294591
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#602943}
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/app/chrome_main_delegate.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/app/chrome_main_delegate.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_android.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_android.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_linux.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_linux.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_mac.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_mac.mm
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_posix.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_posix.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_win.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_browser_main_win.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/chrome/browser/chromeos/chrome_browser_main_chromeos.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/content/app/content_main_runner_impl.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/content/public/app/content_main_delegate.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/content/public/app/content_main_delegate.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/ui/base/resource/resource_bundle.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/ui/base/resource/resource_bundle.h
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/ui/base/resource/resource_bundle_android.cc
[modify] https://crrev.com/713b82e7bdb4d4fe94898b29dea613746ecb9f52/ui/base/resource/resource_bundle_android.h
Project Member

Comment 6 by bugdroid1@chromium.org, Nov 29

Labels: merge-merged-3578
The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/61e87f87814462cd83093b61f419282eb4bc42b0

commit 61e87f87814462cd83093b61f419282eb4bc42b0
Author: Alexei Svitkine <asvitkine@chromium.org>
Date: Thu Nov 29 06:23:36 2018

Remove code that loads resources.pak earlier.

This was introduce in https://crrev.com/c/1034133. In the follow up CL, we plan
to create the entire ResouceBundle earlier, not just loading the DataPack which
contains the service manifests earlier.

TBR=hanxi@google.com

(cherry picked from commit 713b82e7bdb4d4fe94898b29dea613746ecb9f52)

Bug: 815230
Change-Id: I64b12d5f7d28c5aa51678bd077415ddc8155a0e4
Reviewed-on: https://chromium-review.googlesource.com/c/1294591
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#602943}
Reviewed-on: https://chromium-review.googlesource.com/c/1354266
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#844}
Cr-Branched-From: 4226ddf99103e493d7afb23a4c7902ee496108b6-refs/heads/master@{#599034}
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/app/chrome_main_delegate.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/app/chrome_main_delegate.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_android.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_android.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_linux.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_linux.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_mac.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_mac.mm
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_posix.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_posix.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_win.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_browser_main_win.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_content_browser_client.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chrome_content_browser_client.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/chrome/browser/chromeos/chrome_browser_main_chromeos.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/content/app/content_main_runner_impl.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/content/public/app/content_main_delegate.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/content/public/app/content_main_delegate.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/ui/base/resource/resource_bundle.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/ui/base/resource/resource_bundle.h
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/ui/base/resource/resource_bundle_android.cc
[modify] https://crrev.com/61e87f87814462cd83093b61f419282eb4bc42b0/ui/base/resource/resource_bundle_android.h
Project Member

Comment 7 by cr-audit...@appspot.gserviceaccount.com, Nov 29

Labels: CommitLog-Audit-Violation Merge-Without-Approval M-71
Here's a summary of the rules that were executed: 
 - OnlyMergeApprovedChange: Rule Failed -- Revision 61e87f87814462cd83093b61f419282eb4bc42b0 was merged to refs/branch-heads/3578 branch with no merge approval from a TPM! 
Please explain why this change was merged to the branch!
 - AcknowledgeMerge: Notification Required --
Project Member

Comment 8 by cr-audit...@appspot.gserviceaccount.com, Nov 29

Labels: Merge-Merged-71-3578
The following revision refers to this bug: 
https://chromium.googlesource.com/chromium/src.git/+/61e87f87814462cd83093b61f419282eb4bc42b0

Commit: 61e87f87814462cd83093b61f419282eb4bc42b0
Author: asvitkine@chromium.org
Commiter: asvitkine@chromium.org
Date: 2018-11-29 06:23:36 +0000 UTC

Remove code that loads resources.pak earlier.

This was introduce in https://crrev.com/c/1034133. In the follow up CL, we plan
to create the entire ResouceBundle earlier, not just loading the DataPack which
contains the service manifests earlier.

TBR=hanxi@google.com

(cherry picked from commit 713b82e7bdb4d4fe94898b29dea613746ecb9f52)

Bug: 815230
Change-Id: I64b12d5f7d28c5aa51678bd077415ddc8155a0e4
Reviewed-on: https://chromium-review.googlesource.com/c/1294591
Commit-Queue: Xi Han <hanxi@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#602943}
Reviewed-on: https://chromium-review.googlesource.com/c/1354266
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#844}
Cr-Branched-From: 4226ddf99103e493d7afb23a4c7902ee496108b6-refs/heads/master@{#599034}
►

Sign in to add a comment