ShellConnection -> ServiceContext

content/common/mojo/embedded_application_runner.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 "content/common/mojo/embedded_application_runner.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_checker.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/shell_connection.h"
+#include "services/shell/public/cpp/service_context.h"
 
 namespace content {
 
 class EmbeddedApplicationRunner::Instance
     : public base::RefCountedThreadSafe<Instance> {
  public:
   Instance(const base::StringPiece& name,
            const MojoApplicationInfo& info,
            const base::Closure& quit_closure)
       : name_(name.as_string()),
@@ skipping 34 matching lines @@
  private:
   void BindServiceRequestOnApplicationThread(
       shell::mojom::ServiceRequest request) {
     DCHECK(application_task_runner_->BelongsToCurrentThread());
 
     if (!service_) {
       service_ = factory_callback_.Run(
           base::Bind(&Instance::Quit, base::Unretained(this)));
     }
 
-    shell::ShellConnection* new_connection =
-        new shell::ShellConnection(service_.get(), std::move(request));
+    shell::ServiceContext* new_connection =
+        new shell::ServiceContext(service_.get(), std::move(request));
     shell_connections_.push_back(base::WrapUnique(new_connection));
     new_connection->SetConnectionLostClosure(
         base::Bind(&Instance::OnStop, base::Unretained(this),
                    new_connection));
   }
 
  private:
   friend class base::RefCountedThreadSafe<Instance>;
 
   ~Instance() {
     // If this instance had its own thread, it MUST be explicitly destroyed by
     // ShutDown() on the runner's thread by the time this destructor is run.
     DCHECK(!thread_);
   }
 
-  void OnStop(shell::ShellConnection* connection) {
+  void OnStop(shell::ServiceContext* connection) {
     DCHECK(application_task_runner_->BelongsToCurrentThread());
 
     for (auto it = shell_connections_.begin(); it != shell_connections_.end();
          ++it) {
       if (it->get() == connection) {
         shell_connections_.erase(it);
         break;
       }
     }
   }
@@ skipping 24 matching lines @@
   base::ThreadChecker runner_thread_checker_;
 
   // These fields must only be accessed from the runner's thread.
   std::unique_ptr<base::Thread> thread_;
   scoped_refptr<base::SingleThreadTaskRunner> application_task_runner_;
 
   // These fields must only be accessed from the application thread, except in
   // the destructor which may run on either the runner thread or the application
   // thread.
   std::unique_ptr<shell::Service> service_;
-  std::vector<std::unique_ptr<shell::ShellConnection>> shell_connections_;
+  std::vector<std::unique_ptr<shell::ServiceContext>> shell_connections_;
 
   DISALLOW_COPY_AND_ASSIGN(Instance);
 };
 
 EmbeddedApplicationRunner::EmbeddedApplicationRunner(
     const base::StringPiece& name,
     const MojoApplicationInfo& info)
     : weak_factory_(this) {
   instance_ = new Instance(name, info,
                            base::Bind(&EmbeddedApplicationRunner::OnQuit,
@@ skipping 13 matching lines @@
     const base::Closure& quit_closure) {
   quit_closure_ = quit_closure;
 }
 
 void EmbeddedApplicationRunner::OnQuit() {
   if (!quit_closure_.is_null())
     quit_closure_.Run();
 }
 
 }  // namespace content