ShellClient -> Service

services/shell/background/tests/background_shell_unittest.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 "services/shell/background/background_shell.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "services/shell/background/tests/test.mojom.h"
 #include "services/shell/background/tests/test_catalog_store.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace shell {
 namespace {
 
 const char kTestName[] = "mojo:test-app";
 
-class ShellClientImpl : public ShellClient {
+class ServiceImpl : public Service {
  public:
-  ShellClientImpl() {}
-  ~ShellClientImpl() override {}
+  ServiceImpl() {}
+  ~ServiceImpl() override {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ShellClientImpl);
+  DISALLOW_COPY_AND_ASSIGN(ServiceImpl);
 };
 
 std::unique_ptr<TestCatalogStore> BuildTestCatalogStore() {
   std::unique_ptr<base::ListValue> apps(new base::ListValue);
   apps->Append(BuildPermissiveSerializedAppInfo(kTestName, "test"));
   return base::WrapUnique(new TestCatalogStore(std::move(apps)));
 }
 
 void SetFlagAndRunClosure(bool* flag, const base::Closure& closure) {
   *flag = true;
@@ skipping 14 matching lines @@
 #endif
 TEST(BackgroundShellTest, MAYBE_Basic) {
   base::MessageLoop message_loop;
   BackgroundShell background_shell;
   std::unique_ptr<BackgroundShell::InitParams> init_params(
       new BackgroundShell::InitParams);
   std::unique_ptr<TestCatalogStore> store_ptr = BuildTestCatalogStore();
   TestCatalogStore* store = store_ptr.get();
   init_params->catalog_store = std::move(store_ptr);
   background_shell.Init(std::move(init_params));
-  ShellClientImpl shell_client;
+  ServiceImpl service;
   ShellConnection shell_connection(
-      &shell_client, background_shell.CreateShellClientRequest(kTestName));
+      &service, background_shell.CreateServiceRequest(kTestName));
   mojom::TestServicePtr test_service;
   shell_connection.connector()->ConnectToInterface(
       "mojo:background_shell_test_app", &test_service);
   base::RunLoop run_loop;
   bool got_result = false;
   test_service->Test(base::Bind(&SetFlagAndRunClosure, &got_result,
                                 run_loop.QuitClosure()));
   run_loop.Run();
   EXPECT_TRUE(got_result);
   EXPECT_TRUE(store->get_store_called());
 }
 
 }  // namespace shell