| Index: services/service_manager/embedder/main.cc
|
| diff --git a/services/service_manager/embedder/main.cc b/services/service_manager/embedder/main.cc
|
| index 86a6a62f62018f767bbd02a92d1dc35a1aad7062..24b9d66b00c7cda703bc60fa5f58b0d8e5dcb822 100644
|
| --- a/services/service_manager/embedder/main.cc
|
| +++ b/services/service_manager/embedder/main.cc
|
| @@ -266,7 +266,6 @@ int RunServiceManager(MainDelegate* delegate) {
|
| }
|
|
|
| void InitializeResources() {
|
| - ui::RegisterPathProvider();
|
| const std::string locale =
|
| base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
|
| ::switches::kLang);
|
| @@ -392,6 +391,8 @@ int Main(const MainParams& params) {
|
| mojo::edk::SetMaxMessageSize(kMaximumMojoMessageSize);
|
| mojo::edk::Init();
|
|
|
| + ui::RegisterPathProvider();
|
| +
|
| base::debug::GlobalActivityTracker* tracker =
|
| base::debug::GlobalActivityTracker::Get();
|
| int exit_code = delegate->Initialize(init_params);
|
|
|