Removes ServiceProviders from ViewManager::Embed

mandoline/ui/browser/browser.h

Index: mandoline/ui/browser/browser.h
diff --git a/mandoline/ui/browser/browser.h b/mandoline/ui/browser/browser.h
index 3728f3ac9c33d4bd516cf6c53ef6436921042420..47cc0a3e86fa4b3f61fa530ef77beeb962726488 100644
--- a/mandoline/ui/browser/browser.h
+++ b/mandoline/ui/browser/browser.h
@@ -15,7 +15,6 @@
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
-#include "mojo/application/public/cpp/service_provider_impl.h"
 #include "mojo/common/weak_binding_set.h"
 #include "ui/mojo/events/input_events.mojom.h"
 #include "url/gurl.h"
@@ -28,7 +27,6 @@ namespace mandoline {
 
 class BrowserUI;
 class FrameTree;
-class MergedServiceProvider;
 
 class Browser : public mojo::ApplicationDelegate,
                 public mojo::ViewManagerDelegate,
@@ -57,12 +55,10 @@ class Browser : public mojo::ApplicationDelegate,
       mojo::ApplicationConnection* connection) override;
 
   // Overridden from mojo::ViewManagerDelegate:
-  void OnEmbed(mojo::View* root,
-               mojo::InterfaceRequest<mojo::ServiceProvider> services,
-               mojo::ServiceProviderPtr exposed_services) override;
-  bool OnWillEmbed(mojo::View* view,
-                   mojo::InterfaceRequest<mojo::ServiceProvider>* services,
-                   mojo::ServiceProviderPtr* exposed_services) override;
+  void OnEmbed(mojo::View* root) override;
+  void OnEmbedForDescendant(mojo::View* view,
+                            mojo::URLRequestPtr request,
+                            mojo::ViewManagerClientPtr* client) override;
   void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override;
 
   // Overridden from ViewManagerRootClient:
@@ -72,9 +68,7 @@ class Browser : public mojo::ApplicationDelegate,
   void OpenURL(const mojo::String& url) override;
 
   // Overridden from ViewEmbedder:
-  void Embed(mojo::URLRequestPtr request,
-             mojo::InterfaceRequest<mojo::ServiceProvider> services,
-             mojo::ServiceProviderPtr exposed_services) override;
+  void Embed(mojo::URLRequestPtr request) override;
 
   // Overridden from mojo::InterfaceFactory<mojo::NavigatorHost>:
   void Create(mojo::ApplicationConnection* connection,
@@ -84,9 +78,7 @@ class Browser : public mojo::ApplicationDelegate,
   void Create(mojo::ApplicationConnection* connection,
               mojo::InterfaceRequest<ViewEmbedder> request) override;
 
-  void ShowOmnibox(mojo::URLRequestPtr request,
-                   mojo::InterfaceRequest<mojo::ServiceProvider> services,
-                   mojo::ServiceProviderPtr exposed_services);
+  void ShowOmnibox(mojo::URLRequestPtr request);
 
   scoped_ptr<mojo::ViewManagerInit> view_manager_init_;
 
@@ -98,9 +90,6 @@ class Browser : public mojo::ApplicationDelegate,
   std::string default_url_;
   mojo::URLRequestPtr pending_request_;
 
-  mojo::ServiceProviderImpl exposed_services_impl_;
-  scoped_ptr<MergedServiceProvider> merged_service_provider_;
-
   mojo::WeakBindingSet<ViewEmbedder> view_embedder_bindings_;
 
   NavigatorHostImpl navigator_host_;