Make Service own ServiceContext.

mash/browser/browser.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 "mash/browser/browser.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 843 matching lines @@
 void Browser::RemoveWindow(views::Widget* window) {
   auto it = std::find(windows_.begin(), windows_.end(), window);
   DCHECK(it != windows_.end());
   windows_.erase(it);
   if (windows_.empty())
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 std::unique_ptr<navigation::View> Browser::CreateView() {
   navigation::mojom::ViewFactoryPtr factory;
-  connector_->ConnectToInterface("exe:navigation", &factory);
+  connector()->ConnectToInterface("exe:navigation", &factory);
   return base::WrapUnique(new navigation::View(std::move(factory)));
 }
 
-void Browser::OnStart(shell::Connector* connector,
-                      const shell::Identity& identity,
-                      uint32_t id) {
-  connector_ = connector;
-  tracing_.Initialize(connector, identity.name());
+void Browser::OnStart(const shell::Identity& identity) {
+  tracing_.Initialize(connector(), identity.name());
 
-  aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+  aura_init_.reset(
+      new views::AuraInit(connector(), "views_mus_resources.pak"));
   window_manager_connection_ =
-      views::WindowManagerConnection::Create(connector, identity);
+      views::WindowManagerConnection::Create(connector(), identity);
 }
 
 bool Browser::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::Launchable>(this);
   return true;
 }
 
 void Browser::Launch(uint32_t what, mojom::LaunchMode how) {
   bool reuse =
       how == mojom::LaunchMode::REUSE || how == mojom::LaunchMode::DEFAULT;
@@ skipping 10 matching lines @@
   AddWindow(window);
 }
 
 void Browser::Create(const shell::Identity& remote_identity,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace browser
 }  // namespace mash