Make Service own ServiceContext.

services/ui/demo/mus_demo.h

 // 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.
 
 #ifndef SERVICES_UI_DEMO_MUS_DEMO_H_
 #define SERVICES_UI_DEMO_MUS_DEMO_H_
 
 #include <map>
 #include <memory>
 #include <set>
@@ skipping 17 matching lines @@
 // simple way to demonstrate that the graphic stack works as intended.
 class MusDemo : public shell::Service,
                 public WindowTreeClientDelegate,
                 public WindowManagerDelegate {
  public:
   MusDemo();
   ~MusDemo() override;
 
  private:
   // shell::Service:
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override;
+  void OnStart(const shell::Identity& identity) override;
   bool OnConnect(shell::Connection* connection) override;
 
   // WindowTreeClientDelegate:
   void OnEmbed(Window* root) override;
   void OnDidDestroyClient(WindowTreeClient* client) override;
   void OnEventObserved(const Event& event, Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(WindowManagerClient* client) override;
   bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
@@ skipping 11 matching lines @@
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(Window* window) override;
 
   // Allocate a bitmap the same size as the window to draw into.
   void AllocBitmap();
 
   // Draws one frame, incrementing the rotation angle.
   void DrawFrame();
 
-  shell::Connector* connector_ = nullptr;
-
   Window* window_ = nullptr;
   WindowTreeClient* window_tree_client_ = nullptr;
 
   // Used to send frames to mus.
   std::unique_ptr<ui::BitmapUploader> uploader_;
 
   // Bitmap that is the same size as our client window area.
   SkBitmap bitmap_;
 
   // Timer for calling DrawFrame().
   base::RepeatingTimer timer_;
 
   // Current rotation angle for drawing.
   double angle_ = 0.0;
 
   DISALLOW_COPY_AND_ASSIGN(MusDemo);
 };
 
 }  // namespace demo
 }  // namespace ui
 
 #endif  // SERVICES_UI_DEMO_MUS_DEMO_H_