commit a14a8cd970f00bac9104362997eb8273d188baf3
author John Budorick <jbudorick@chromium.org> Sat Apr 28 01:35:12 2018
committer Commit Bot <commit-bot@chromium.org> Sat Apr 28 01:35:12 2018
tree ca94d33f7fd1067fc03b21fe51aa73cecb75547b
parent 044eadf326e5c83fe3f3487196b36a00c534a807

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}