Removes ServiceProviders from ViewManager::Embed

components/view_manager/view_manager_app.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/view_manager_app.h"
 
 #include "base/command_line.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
 #include "components/view_manager/display_manager.h"
@@ skipping 63 matching lines @@
 }
 
 void ViewManagerApp::OnLostConnectionToWindowManager() {
   app_impl_->Terminate();
 }
 
 ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
     ConnectionManager* connection_manager,
     mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
     mojo::ConnectionSpecificId creator_id,
-    const std::string& creator_url,
     mojo::URLRequestPtr request,
     const ViewId& root_id) {
   mojo::ViewManagerClientPtr client;
-  std::string url = request->url.To<std::string>();
   app_impl_->ConnectToService(request.Pass(), &client);
 
-  scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
-      connection_manager, creator_id, creator_url, url, root_id));
+  scoped_ptr<ViewManagerServiceImpl> service(
+      new ViewManagerServiceImpl(connection_manager, creator_id, root_id));
   return new DefaultClientConnection(service.Pass(), connection_manager,
                                      service_request.Pass(), client.Pass());
 }
 
 ClientConnection* ViewManagerApp::CreateClientConnectionForEmbedAtView(
     ConnectionManager* connection_manager,
     mojo::InterfaceRequest<mojo::ViewManagerService> service_request,
     mojo::ConnectionSpecificId creator_id,
-    const std::string& creator_url,
     const ViewId& root_id,
     mojo::ViewManagerClientPtr view_manager_client) {
-  scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
-      connection_manager, creator_id, creator_url, std::string(), root_id));
+  scoped_ptr<ViewManagerServiceImpl> service(
+      new ViewManagerServiceImpl(connection_manager, creator_id, root_id));
   return new DefaultClientConnection(service.Pass(), connection_manager,
                                      service_request.Pass(),
                                      view_manager_client.Pass());
 }
 
 void ViewManagerApp::Create(ApplicationConnection* connection,
                             InterfaceRequest<ViewManagerService> request) {
   if (connection_manager_->has_window_manager_client_connection()) {
     VLOG(1) << "ViewManager interface requested more than once.";
     return;
   }
 
   scoped_ptr<ViewManagerServiceImpl> service(new ViewManagerServiceImpl(
-      connection_manager_.get(), kInvalidConnectionId, std::string(),
-      connection->GetRemoteApplicationURL(), RootViewId()));
+      connection_manager_.get(), kInvalidConnectionId, RootViewId()));
   mojo::ViewManagerClientPtr client;
   connection->ConnectToService(&client);
   scoped_ptr<ClientConnection> client_connection(
       new DefaultClientConnection(service.Pass(), connection_manager_.get(),
                                   request.Pass(), client.Pass()));
   connection_manager_->SetWindowManagerClientConnection(
       client_connection.Pass());
 }
 
 void ViewManagerApp::Create(ApplicationConnection* connection,
@@ skipping 16 matching lines @@
   if (!gpu_state_.get())
     gpu_state_ = new gles2::GpuState;
   new gles2::GpuImpl(request.Pass(), gpu_state_);
 }
 
 void ViewManagerApp::OnConnectionError() {
   app_impl_->Terminate();
 }
 
 }  // namespace view_manager