Remove |requestor_url| from ApplicationManager::ConnectToApplication().

mojo/shell/application_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 "mojo/shell/application_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 55 matching lines @@
   STLDeleteValues(&url_to_loader_);
   STLDeleteValues(&scheme_to_loader_);
 }
 
 void ApplicationManager::TerminateShellConnections() {
   STLDeleteValues(&identity_to_instance_);
 }
 
 void ApplicationManager::ConnectToApplication(
     ApplicationInstance* originator,
-    URLRequestPtr requested_url,
+    URLRequestPtr app_url_request,
     const std::string& qualifier,
-    const GURL& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services,
-    const CapabilityFilter& capability_filter,
+    const CapabilityFilter& filter,
     const base::Closure& on_application_end,
     const Shell::ConnectToApplicationCallback& connect_callback) {
-  DCHECK(requestor_url.is_empty());
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
   params->SetOriginatorInfo(originator);
-  params->SetURLInfo(requested_url.Pass());
+  params->SetURLInfo(app_url_request.Pass());
   params->set_qualifier(qualifier);
   params->set_services(services.Pass());
   params->set_exposed_services(exposed_services.Pass());
-  params->set_filter(capability_filter);
+  params->set_filter(filter);
   params->set_on_application_end(on_application_end);
   params->set_connect_callback(connect_callback);
 
   ConnectToApplication(params.Pass());
 }
 
 void ApplicationManager::ConnectToApplication(
     scoped_ptr<ConnectToApplicationParams> params) {
   GURL original_url = params->app_url();
   URLRequestPtr original_url_request = params->TakeAppURLRequest();
@@ skipping 446 matching lines @@
   services->ConnectToService(interface_name, pipe.handle1.Pass());
   return pipe.handle0.Pass();
 }
 
 Shell::ConnectToApplicationCallback EmptyConnectCallback() {
   return base::Bind(&OnEmptyOnConnectCallback);
 }
 
 }  // namespace shell
 }  // namespace mojo