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