Index: services/service_manager/runner/child/test_native_main.cc |
diff --git a/services/service_manager/runner/child/test_native_main.cc b/services/service_manager/runner/child/test_native_main.cc |
index a56b90d627afc24ebab21af2c711c0f6200bb70d..4bac06c3fb2e8dae59bd8c8ffc2fb90c7dc449b3 100644 |
--- a/services/service_manager/runner/child/test_native_main.cc |
+++ b/services/service_manager/runner/child/test_native_main.cc |
@@ -20,7 +20,7 @@ |
#include "services/service_manager/runner/common/client_util.h" |
#include "services/service_manager/runner/init.h" |
-namespace shell { |
+namespace service_manager { |
namespace { |
class ProcessDelegate : public mojo::edk::ProcessDelegate { |
@@ -36,8 +36,8 @@ class ProcessDelegate : public mojo::edk::ProcessDelegate { |
} // namespace |
-int TestNativeMain(shell::Service* service) { |
- shell::WaitForDebuggerIfNecessary(); |
+int TestNativeMain(service_manager::Service* service) { |
+ service_manager::WaitForDebuggerIfNecessary(); |
#if !defined(OFFICIAL_BUILD) |
base::debug::EnableInProcessStackDumping(); |
@@ -58,8 +58,8 @@ int TestNativeMain(shell::Service* service) { |
mojo::edk::SetParentPipeHandleFromCommandLine(); |
base::MessageLoop loop; |
- service->set_context(base::MakeUnique<shell::ServiceContext>( |
- service, shell::GetServiceRequestFromCommandLine())); |
+ service->set_context(base::MakeUnique<service_manager::ServiceContext>( |
+ service, service_manager::GetServiceRequestFromCommandLine())); |
base::RunLoop().Run(); |
mojo::edk::ShutdownIPCSupport(); |
@@ -70,4 +70,4 @@ int TestNativeMain(shell::Service* service) { |
return 0; |
} |
-} // namespace shell |
+} // namespace service_manager |