ShellClient -> Service

chrome/test/base/mojo_test_connector.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/mojo_test_connector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/process_delegate.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "services/catalog/store.h"
 #include "services/shell/background/tests/test_catalog_store.h"
 #include "services/shell/native_runner_delegate.h"
 #include "services/shell/public/cpp/connector.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/common/switches.h"
 #include "services/shell/shell.h"
 #include "services/shell/switches.h"
 
-using shell::mojom::ShellClient;
-using shell::mojom::ShellClientPtr;
+using shell::mojom::Service;
+using shell::mojom::ServicePtr;
 
 namespace {
 
 const char kTestRunnerName[] = "mojo:test-runner";
 const char kTestName[] = "exe:chrome";
 
 // Returns the Dictionary value of |parent| under the specified key, creating
 // and adding as necessary.
 base::DictionaryValue* EnsureDictionary(base::DictionaryValue* parent,
                                         const char* key) {
@@ skipping 51 matching lines @@
     test_launch_options->inherit_handles = true;
     test_launch_options->handles_to_inherit = &handle_passing_info_;
 #if defined(OFFICIAL_BUILD)
     CHECK(false) << "Launching mojo process with inherit_handles is insecure!";
 #endif
 #elif defined(OS_POSIX)
     test_launch_options->fds_to_remap = &handle_passing_info_;
 #else
 #error "Unsupported"
 #endif
-    shell::mojom::ShellClientPtr client =
-        shell::PassShellClientRequestOnCommandLine(command_line, child_token_);
+    shell::mojom::ServicePtr service =
+        shell::PassServiceRequestOnCommandLine(command_line, child_token_);
 
     std::unique_ptr<shell::ConnectParams> params(new shell::ConnectParams);
     params->set_source(shell::CreateShellIdentity());
     params->set_target(
         shell::Identity(kTestName, shell::mojom::kRootUserID, instance));
 
     shell::mojom::ClientProcessConnectionPtr client_process_connection =
         shell::mojom::ClientProcessConnection::New();
-    client_process_connection->shell_client =
-        client.PassInterface().PassHandle();
+    client_process_connection->service =
+        service.PassInterface().PassHandle();
     client_process_connection->pid_receiver_request =
         mojo::GetProxy(&pid_receiver_).PassMessagePipe();
     params->set_client_process_connection(std::move(client_process_connection));
     shell->Connect(std::move(params));
   }
 
   // Called after the test process has launched. Completes the registration done
   // in Connect().
   void ChildProcessLaunched(base::ProcessHandle handle, base::ProcessId pid) {
     pid_receiver_->SetPID(pid);
@@ skipping 92 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MojoTestState);
 };
 
 }  // namespace
 
 // static
 const char MojoTestConnector::kTestSwitch[] = "is_test";
 
 MojoTestConnector::MojoTestConnector() {}
 
-shell::mojom::ShellClientRequest MojoTestConnector::Init() {
+shell::mojom::ServiceRequest MojoTestConnector::Init() {
   std::unique_ptr<shell::BackgroundShell::InitParams> init_params(
       new shell::BackgroundShell::InitParams);
   init_params->catalog_store = BuildTestCatalogStore();
   // When running in single_process mode chrome initializes the edk.
   init_params->init_edk = !base::CommandLine::ForCurrentProcess()->HasSwitch(
       content::kSingleProcessTestsFlag);
   background_shell_.Init(std::move(init_params));
-  return background_shell_.CreateShellClientRequest(kTestRunnerName);
+  return background_shell_.CreateServiceRequest(kTestRunnerName);
 }
 
 MojoTestConnector::~MojoTestConnector() {}
 
 std::unique_ptr<content::TestState> MojoTestConnector::PrepareForTest(
     base::CommandLine* command_line,
     base::TestLauncher::LaunchOptions* test_launch_options) {
   std::unique_ptr<MojoTestState> test_state(
       new MojoTestState(&background_shell_));
   test_state->Init(command_line, test_launch_options);
   return std::move(test_state);
 }