ShellConnection -> ServiceContext

services/shell/tests/lifecycle/package.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 <algorithm>
 #include <memory>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/application_runner.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 #include "services/shell/public/interfaces/service_factory.mojom.h"
 #include "services/shell/tests/lifecycle/app_client.h"
 #include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
 
 namespace {
 
 class PackagedApp : public shell::Service,
                     public shell::InterfaceFactory<LifecycleControl>,
                     public LifecycleControl {
  public:
   using DestructCallback = base::Callback<void(PackagedApp*)>;
 
   PackagedApp(shell::mojom::ServiceRequest request,
               const DestructCallback& shell_connection_closed_callback,
               const DestructCallback& destruct_callback)
-      : connection_(new shell::ShellConnection(this, std::move(request))),
+      : connection_(new shell::ServiceContext(this, std::move(request))),
         shell_connection_closed_callback_(shell_connection_closed_callback),
         destruct_callback_(destruct_callback) {
     bindings_.set_connection_error_handler(base::Bind(&PackagedApp::BindingLost,
                                                       base::Unretained(this)));
   }
   ~PackagedApp() override {
     destruct_callback_.Run(this);
   }
 
  private:
@@ skipping 28 matching lines @@
     connection_.reset();
     // This only closed our relationship with the shell, existing |bindings_|
     // remain active.
   }
 
   void BindingLost() {
     if (bindings_.empty())
       delete this;
   }
 
-  std::unique_ptr<shell::ShellConnection> connection_;
+  std::unique_ptr<shell::ServiceContext> connection_;
   mojo::BindingSet<LifecycleControl> bindings_;
   // Run when this object's connection to the shell is closed.
   DestructCallback shell_connection_closed_callback_;
   // Run when this object is destructed.
   DestructCallback destruct_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PackagedApp);
 };
 
 class Package
@@ skipping 55 matching lines @@
 };
 
 }  // namespace
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   Package* package = new Package;
   shell::ApplicationRunner runner(package);
   package->set_runner(&runner);
   return runner.Run(shell_handle);
 }