Make Service own ServiceContext.

mash/catalog_viewer/catalog_viewer.h

Index: mash/catalog_viewer/catalog_viewer.h
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h
index efbcf6abf179175b4280d808d9c98b2b568df15e..0d25bf42f7e7a682fb4b5e84b719d8a9d67de257 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/catalog_viewer/catalog_viewer.h
@@ -35,9 +35,7 @@ class CatalogViewer : public shell::Service,
 
  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;
 
   // mojom::Launchable:
@@ -47,8 +45,6 @@ class CatalogViewer : public shell::Service,
   void Create(const shell::Identity& remote_identity,
               mojom::LaunchableRequest request) override;
 
-
-  shell::Connector* connector_ = nullptr;
   mojo::BindingSet<mojom::Launchable> bindings_;
   std::vector<views::Widget*> windows_;