ShellConnection -> ServiceContext

services/shell/public/cpp/service_test.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
 #define SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class MessageLoop;
 }
 
 namespace shell {
 
 class BackgroundShell;
 
@@ skipping 60 matching lines @@
   void SetUp() override;
   void TearDown() override;
 
  private:
   friend ServiceTestClient;
 
   std::unique_ptr<Service> service_;
 
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<BackgroundShell> background_shell_;
-  std::unique_ptr<ShellConnection> shell_connection_;
+  std::unique_ptr<ServiceContext> service_context_;
 
   // See constructor.
   std::string test_name_;
 
   Connector* connector_ = nullptr;
   std::string initialize_name_;
   std::string initialize_userid_ = shell::mojom::kInheritUserID;
   uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID;
 
   base::Closure initialize_called_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceTest);
 };
 
 }  // namespace test
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_