Make Service own ServiceContext.

mash/app_driver/app_driver.cc

 // Copyright 2015 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 "mash/app_driver/app_driver.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 39 matching lines @@
 };
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
 void DoNothing() {}
 
 }  // namespace
 
-AppDriver::AppDriver()
-    : connector_(nullptr), binding_(this), weak_factory_(this) {}
+AppDriver::AppDriver() : binding_(this), weak_factory_(this) {}
 
 AppDriver::~AppDriver() {}
 
 void AppDriver::OnAvailableCatalogEntries(
     mojo::Array<catalog::mojom::EntryPtr> entries) {
   if (entries.empty()) {
     LOG(ERROR) << "Unable to install accelerators for launching chrome.";
     return;
   }
 
   ui::mojom::AcceleratorRegistrarPtr registrar;
-  connector_->ConnectToInterface(entries[0]->name, &registrar);
+  connector()->ConnectToInterface(entries[0]->name, &registrar);
 
   if (binding_.is_bound())
     binding_.Unbind();
   registrar->SetHandler(binding_.CreateInterfacePtrAndBind());
   // If the window manager restarts, the handler pipe will close and we'll need
   // to re-add our accelerators when the window manager comes back up.
   binding_.set_connection_error_handler(
       base::Bind(&AppDriver::AddAccelerators, weak_factory_.GetWeakPtr()));
 
   for (const AcceleratorSpec& spec : g_spec) {
     registrar->AddAccelerator(
         static_cast<uint32_t>(spec.id),
         ui::CreateKeyMatcher(spec.keyboard_code, spec.event_flags),
         base::Bind(&AssertTrue));
   }
 }
 
-void AppDriver::OnStart(shell::Connector* connector,
-                        const shell::Identity& identity,
-                        uint32_t id) {
-  connector_ = connector;
+void AppDriver::OnStart(const shell::Identity& identity) {
   AddAccelerators();
 }
 
 bool AppDriver::OnConnect(shell::Connection* connection) {
   return true;
 }
 
 bool AppDriver::OnStop() {
   // Prevent the code in AddAccelerators() from keeping this app alive.
   binding_.set_connection_error_handler(base::Bind(&DoNothing));
@@ skipping 17 matching lines @@
       {Accelerator::ShowTaskManager,
        {mojom::kWindow, "mojo:task_viewer", LaunchMode::DEFAULT}},
       {Accelerator::ToggleTouchHud,
        {mojom::kWindow, "mojo:touch_hud", LaunchMode::DEFAULT}},
   };
 
   const auto iter = options.find(static_cast<Accelerator>(id));
   DCHECK(iter != options.end());
   const LaunchOptions& entry = iter->second;
   LaunchablePtr launchable;
-  connector_->ConnectToInterface(entry.app, &launchable);
+  connector()->ConnectToInterface(entry.app, &launchable);
   launchable->Launch(entry.option, entry.mode);
 }
 
 void AppDriver::AddAccelerators() {
-  connector_->ConnectToInterface("mojo:catalog", &catalog_);
+  connector()->ConnectToInterface("mojo:catalog", &catalog_);
   catalog_->GetEntriesProvidingClass(
       "mus:window_manager", base::Bind(&AppDriver::OnAvailableCatalogEntries,
                                        weak_factory_.GetWeakPtr()));
 }
 
 }  // namespace app_driver
 }  // namespace mash