Make Service own ServiceContext.

services/ui/demo/mus_demo.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 "services/ui/demo/mus_demo.h"
 
 #include "base/time/time.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/common/gpu_service.h"
 #include "services/ui/public/cpp/bitmap_uploader.h"
@@ skipping 46 matching lines @@
 }
 
 }  // namespace
 
 MusDemo::MusDemo() {}
 
 MusDemo::~MusDemo() {
   delete window_tree_client_;
 }
 
-void MusDemo::OnStart(shell::Connector* connector,
-                      const shell::Identity& identity,
-                      uint32_t id) {
-  connector_ = connector;
-  GpuService::Initialize(connector_);
+void MusDemo::OnStart(const shell::Identity& identity) {
+  GpuService::Initialize(connector());
   window_tree_client_ = new WindowTreeClient(this, this, nullptr);
-  window_tree_client_->ConnectAsWindowManager(connector);
+  window_tree_client_->ConnectAsWindowManager(connector());
 }
 
 bool MusDemo::OnConnect(shell::Connection* connection) {
   return true;
 }
 
 void MusDemo::OnEmbed(Window* window) {
   // Not called for the WindowManager.
   NOTREACHED();
 }
@@ skipping 27 matching lines @@
     bool janky) {
   // Don't care
 }
 
 void MusDemo::OnWmNewDisplay(Window* window, const display::Display& display) {
   DCHECK(!window_);  // Only support one display.
   window_ = window;
 
   // Initialize bitmap uploader for sending frames to MUS.
   uploader_.reset(new ui::BitmapUploader(window_));
-  uploader_->Init(connector_);
+  uploader_->Init(connector());
 
   // Draw initial frame and start the timer to regularly draw frames.
   DrawFrame();
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kFrameDelay),
                base::Bind(&MusDemo::DrawFrame, base::Unretained(this)));
 }
 
 void MusDemo::OnWmPerformMoveLoop(Window* window,
                                   mojom::MoveLoopSource source,
                                   const gfx::Point& cursor_location,
@@ skipping 44 matching lines @@
       new std::vector<unsigned char>(addr, addr + bytes));
   bitmap_.unlockPixels();
 
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
                        ui::BitmapUploader::BGRA);
 }
 
 }  // namespace demo
 }  // namespace ui