Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(774)

Unified Diff: services/shell/runner/child/test_native_main.cc

Issue 1882423004: Move shell service to toplevel shell namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: services/shell/runner/child/test_native_main.cc
diff --git a/services/shell/runner/child/test_native_main.cc b/services/shell/runner/child/test_native_main.cc
index 50dfe5b9846a2440e5eec8d1f35d8a42cac75591..ea5bd0c96bb8db6d5a9aadafb5cbc1c49466a98e 100644
--- a/services/shell/runner/child/test_native_main.cc
+++ b/services/shell/runner/child/test_native_main.cc
@@ -19,7 +19,6 @@
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/init.h"
-namespace mojo {
namespace shell {
namespace {
@@ -36,8 +35,8 @@ class ProcessDelegate : public mojo::edk::ProcessDelegate {
} // namespace
-int TestNativeMain(mojo::ShellClient* shell_client) {
- mojo::shell::WaitForDebuggerIfNecessary();
+int TestNativeMain(shell::ShellClient* shell_client) {
+ shell::WaitForDebuggerIfNecessary();
#if !defined(OFFICIAL_BUILD)
base::debug::EnableInProcessStackDumping();
@@ -58,8 +57,8 @@ int TestNativeMain(mojo::ShellClient* shell_client) {
mojo::edk::SetParentPipeHandleFromCommandLine();
base::MessageLoop loop;
- mojo::ShellConnection impl(
- shell_client, mojo::shell::GetShellClientRequestFromCommandLine());
+ shell::ShellConnection impl(shell_client,
+ shell::GetShellClientRequestFromCommandLine());
loop.Run();
mojo::edk::ShutdownIPCSupport();
@@ -69,4 +68,3 @@ int TestNativeMain(mojo::ShellClient* shell_client) {
}
} // namespace shell
-} // namespace mojo
« no previous file with comments | « services/shell/runner/child/test_native_main.h ('k') | services/shell/runner/child/test_native_service.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698