Removes ServiceProviders from ViewManager::Embed

components/view_manager/connection_manager.cc

 // Copyright 2014 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 "components/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager_delegate.h"
@@ skipping 158 matching lines @@
   // TODO(sky): I may want to advance focus differently if focus is in
   // |connection|.
 
   // Notify remaining connections so that they can cleanup.
   for (auto& pair : connection_map_) {
     pair.second->service()->OnWillDestroyViewManagerServiceImpl(
         connection->service());
   }
 }
 
-void ConnectionManager::EmbedAtView(
-    ConnectionSpecificId creator_id,
-    mojo::URLRequestPtr request,
-    const ViewId& view_id,
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
-    mojo::ServiceProviderPtr exposed_services) {
-  std::string creator_url;
-  ConnectionMap::const_iterator it = connection_map_.find(creator_id);
-  if (it != connection_map_.end())
-    creator_url = it->second->service()->url();
-
+void ConnectionManager::EmbedAtView(mojo::ConnectionSpecificId creator_id,
+                                    const ViewId& view_id,
+                                    mojo::URLRequestPtr request) {
   mojo::ViewManagerServicePtr service_ptr;
   ClientConnection* client_connection =
       delegate_->CreateClientConnectionForEmbedAtView(
-          this, GetProxy(&service_ptr), creator_id, creator_url, request.Pass(),
-          view_id);
+          this, GetProxy(&service_ptr), creator_id, request.Pass(), view_id);
   AddConnection(client_connection);
   client_connection->service()->Init(client_connection->client(),
-                                     service_ptr.Pass(), services.Pass(),
-                                     exposed_services.Pass());
+                                     service_ptr.Pass());
   OnConnectionMessagedClient(client_connection->service()->id());
 }
 
 void ConnectionManager::EmbedAtView(mojo::ConnectionSpecificId creator_id,
                                     const ViewId& view_id,
                                     mojo::ViewManagerClientPtr client) {
-  std::string creator_url;
-  ConnectionMap::const_iterator it = connection_map_.find(creator_id);
-  if (it != connection_map_.end())
-    creator_url = it->second->service()->url();
-
   mojo::ViewManagerServicePtr service_ptr;
   ClientConnection* client_connection =
       delegate_->CreateClientConnectionForEmbedAtView(
-          this, GetProxy(&service_ptr), creator_id, creator_url, view_id,
-          client.Pass());
+          this, GetProxy(&service_ptr), creator_id, view_id, client.Pass());
   AddConnection(client_connection);
   client_connection->service()->Init(client_connection->client(),
-                                     service_ptr.Pass(), nullptr, nullptr);
+                                     service_ptr.Pass());
   OnConnectionMessagedClient(client_connection->service()->id());
 }
 
 ViewManagerServiceImpl* ConnectionManager::GetConnection(
     ConnectionSpecificId connection_id) {
   ConnectionMap::iterator i = connection_map_.find(connection_id);
   return i == connection_map_.end() ? nullptr : i->second->service();
 }
 
 ServerView* ConnectionManager::GetView(const ViewId& id) {
@@ skipping 49 matching lines @@
   }
   return nullptr;
 }
 
 void ConnectionManager::SetWindowManagerClientConnection(
     scoped_ptr<ClientConnection> connection) {
   CHECK(!window_manager_client_connection_);
   window_manager_client_connection_ = connection.release();
   AddConnection(window_manager_client_connection_);
   window_manager_client_connection_->service()->Init(
-      window_manager_client_connection_->client(), nullptr, nullptr, nullptr);
+      window_manager_client_connection_->client(), nullptr);
 }
 
 mojo::ViewManagerClient*
 ConnectionManager::GetWindowManagerViewManagerClient() {
   CHECK(window_manager_client_connection_);
   return window_manager_client_connection_->client();
 }
 
 bool ConnectionManager::CloneAndAnimate(const ViewId& view_id) {
   ServerView* view = GetView(view_id);
@@ skipping 319 matching lines @@
     if (wm_connection != owning_connection_old &&
         wm_connection != embedded_connection_old &&
         wm_connection != owning_connection_new &&
         wm_connection != embedded_connection_new) {
       wm_connection->ProcessFocusChanged(old_focused_view, new_focused_view);
     }
   }
 }
 
 }  // namespace view_manager