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

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

Issue 2118083002: ShellClient -> Service (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mus2
Patch Set: . Created 4 years, 5 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
« no previous file with comments | « services/shell/runner/child/test_native_main.h ('k') | services/shell/runner/common/client_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 83a970952e54b89275fd13c4dbe6ed7dad1c6e1e..ded151abf0977df8bc01b7a8824c05c699ba259d 100644
--- a/services/shell/runner/child/test_native_main.cc
+++ b/services/shell/runner/child/test_native_main.cc
@@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/process_delegate.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
#include "services/shell/public/cpp/shell_connection.h"
#include "services/shell/runner/common/client_util.h"
#include "services/shell/runner/init.h"
@@ -36,7 +36,7 @@ class ProcessDelegate : public mojo::edk::ProcessDelegate {
} // namespace
-int TestNativeMain(shell::ShellClient* shell_client) {
+int TestNativeMain(shell::Service* service) {
shell::WaitForDebuggerIfNecessary();
#if !defined(OFFICIAL_BUILD)
@@ -58,8 +58,8 @@ int TestNativeMain(shell::ShellClient* shell_client) {
mojo::edk::SetParentPipeHandleFromCommandLine();
base::MessageLoop loop;
- shell::ShellConnection impl(shell_client,
- shell::GetShellClientRequestFromCommandLine());
+ shell::ShellConnection impl(service,
+ shell::GetServiceRequestFromCommandLine());
base::RunLoop().Run();
mojo::edk::ShutdownIPCSupport();
« no previous file with comments | « services/shell/runner/child/test_native_main.h ('k') | services/shell/runner/common/client_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698