| Index: services/service_manager/background/background_shell_main.cc
|
| diff --git a/services/service_manager/background/background_shell_main.cc b/services/service_manager/background/background_shell_main.cc
|
| index d4f55926d44c90a9828ff0c3b89775da49f7924e..1f4590dd45f1fadc166064b1053dd7e1c6988dbd 100644
|
| --- a/services/service_manager/background/background_shell_main.cc
|
| +++ b/services/service_manager/background/background_shell_main.cc
|
| @@ -12,7 +12,7 @@
|
| #include "services/service_manager/runner/host/child_process.h"
|
| #include "services/service_manager/runner/init.h"
|
|
|
| -namespace shell {
|
| +namespace service_manager {
|
| namespace {
|
|
|
| int RunChildProcess() {
|
| @@ -26,13 +26,13 @@ int RunChildProcess() {
|
| }
|
|
|
| } // namespace
|
| -} // namespace shell
|
| +} // namespace service_manager
|
|
|
| int main(int argc, char** argv) {
|
| base::CommandLine::Init(argc, argv);
|
| if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kChildProcess)) {
|
| - return shell::RunChildProcess();
|
| + return service_manager::RunChildProcess();
|
| }
|
| // Reset CommandLine as most likely main() is going to use CommandLine too
|
| // and expect to be able to initialize it.
|
|
|