Removes ServiceProviders from ViewManager::Embed

components/view_manager/public/cpp/lib/view_manager_client_impl.cc

Index: components/view_manager/public/cpp/lib/view_manager_client_impl.cc
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
index 7bea3efc655cbad4b878566504b40514c5cb391f..6ec387f7c3b54873d4ada89d5004dc75119b24a1 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
+++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.cc
@@ -202,21 +202,6 @@ void ViewManagerClientImpl::SetProperty(
                             ActionCompletedCallback());
 }
 
-void ViewManagerClientImpl::Embed(const String& url, Id view_id) {
-  mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From(url);
-  Embed(request.Pass(), view_id, nullptr, nullptr);
-}
-
-void ViewManagerClientImpl::Embed(mojo::URLRequestPtr request,
-                                  Id view_id,
-                                  InterfaceRequest<ServiceProvider> services,
-                                  ServiceProviderPtr exposed_services) {
-  DCHECK(service_);
-  service_->EmbedRequest(request.Pass(), view_id, services.Pass(),
-                         exposed_services.Pass(), ActionCompletedCallback());
-}
-
 void ViewManagerClientImpl::Embed(Id view_id, ViewManagerClientPtr client) {
   DCHECK(service_);
   service_->Embed(view_id, client.Pass(), ActionCompletedCallback());
@@ -225,7 +210,7 @@ void ViewManagerClientImpl::Embed(Id view_id, ViewManagerClientPtr client) {
 void ViewManagerClientImpl::EmbedAllowingReembed(mojo::URLRequestPtr request,
                                                  Id view_id) {
   DCHECK(service_);
-  service_->EmbedAllowingReembed(request.Pass(), view_id,
+  service_->EmbedAllowingReembed(view_id, request.Pass(),
                                  ActionCompletedCallback());
 }
 
@@ -262,10 +247,6 @@ Id ViewManagerClientImpl::CreateViewOnServer() {
   return view_id;
 }
 
-const std::string& ViewManagerClientImpl::GetEmbedderURL() const {
-  return creator_url_;
-}
-
 View* ViewManagerClientImpl::GetRoot() {
   return root_;
 }
@@ -295,11 +276,8 @@ void ViewManagerClientImpl::SetEmbedRoot() {
 // ViewManagerClientImpl, ViewManagerClient implementation:
 
 void ViewManagerClientImpl::OnEmbed(ConnectionSpecificId connection_id,
-                                    const String& creator_url,
                                     ViewDataPtr root_data,
                                     ViewManagerServicePtr view_manager_service,
-                                    InterfaceRequest<ServiceProvider> services,
-                                    ServiceProviderPtr exposed_services,
                                     Id focused_view_id) {
   if (view_manager_service) {
     DCHECK(!service_);
@@ -307,7 +285,6 @@ void ViewManagerClientImpl::OnEmbed(ConnectionSpecificId connection_id,
     service_.set_error_handler(this);
   }
   connection_id_ = connection_id;
-  creator_url_ = String::From(creator_url);
 
   DCHECK(!root_);
   root_ = AddViewToViewManager(this, nullptr, root_data);
@@ -315,19 +292,18 @@ void ViewManagerClientImpl::OnEmbed(ConnectionSpecificId connection_id,
 
   focused_view_ = GetViewById(focused_view_id);
 
-  delegate_->OnEmbed(root_, services.Pass(), exposed_services.Pass());
+  delegate_->OnEmbed(root_);
 }
 
-void ViewManagerClientImpl::OnWillEmbed(
+void ViewManagerClientImpl::OnEmbedForDescendant(
     Id view_id,
-    InterfaceRequest<ServiceProvider> services,
-    ServiceProviderPtr exposed_services,
-    const OnWillEmbedCallback& callback) {
+    mojo::URLRequestPtr request,
+    const OnEmbedForDescendantCallback& callback) {
   View* view = GetViewById(view_id);
-  bool allow_embed = false;
+  ViewManagerClientPtr client;
   if (view)
-    allow_embed = delegate_->OnWillEmbed(view, &services, &exposed_services);
-  callback.Run(allow_embed, services.Pass(), exposed_services.Pass());
+    delegate_->OnEmbedForDescendant(view, request.Pass(), &client);
+  callback.Run(client.Pass());
 }
 
 void ViewManagerClientImpl::OnEmbeddedAppDisconnected(Id view_id) {