Remove |requestor_url| from ApplicationManager::ConnectToApplication().
BUG=None
Review URL: https://codereview.chromium.org/1318523007
Cr-Commit-Position: refs/heads/master@{#347243}
CrOS-Libchrome-Original-Commit: 3b69954d1d15cf96973789f3e58087792cc25903
diff --git a/mojo/runner/about_fetcher_unittest.cc b/mojo/runner/about_fetcher_unittest.cc
index 64eb625..2f5b2d9 100644
--- a/mojo/runner/about_fetcher_unittest.cc
+++ b/mojo/runner/about_fetcher_unittest.cc
@@ -134,9 +134,9 @@
URLRequestPtr request(URLRequest::New());
request->url = url;
application_manager_->ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(),
- service_provider_request.Pass(), nullptr, shell::CapabilityFilter(),
- base::Closure(), shell::EmptyConnectCallback());
+ nullptr, request.Pass(), std::string(), service_provider_request.Pass(),
+ nullptr, shell::CapabilityFilter(), base::Closure(),
+ shell::EmptyConnectCallback());
run_loop.Run();
}
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 20babc9..52e7946 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -315,8 +315,8 @@
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From("mojo:tracing");
application_manager_.ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(),
- GetProxy(&service_provider_ptr), tracing_service_provider_ptr.Pass(),
+ nullptr, request.Pass(), std::string(), GetProxy(&service_provider_ptr),
+ tracing_service_provider_ptr.Pass(),
shell::GetPermissiveCapabilityFilter(), base::Closure(),
shell::EmptyConnectCallback());
@@ -383,7 +383,7 @@
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url.spec());
application_manager_.ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(), GetProxy(&services),
+ nullptr, request.Pass(), std::string(), GetProxy(&services),
exposed_services.Pass(), shell::GetPermissiveCapabilityFilter(),
base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url),
shell::EmptyConnectCallback());
diff --git a/mojo/runner/native_runner_unittest.cc b/mojo/runner/native_runner_unittest.cc
index 351fb34..4df437a 100644
--- a/mojo/runner/native_runner_unittest.cc
+++ b/mojo/runner/native_runner_unittest.cc
@@ -104,7 +104,7 @@
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url.spec());
application_manager_.ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(), services.Pass(),
+ nullptr, request.Pass(), std::string(), services.Pass(),
service_provider.Pass(), shell::GetPermissiveCapabilityFilter(),
base::Closure(), shell::EmptyConnectCallback());
EXPECT_FALSE(state_.runner_was_created);
diff --git a/mojo/runner/shell_test_base.cc b/mojo/runner/shell_test_base.cc
index 890ff3d..820e664 100644
--- a/mojo/runner/shell_test_base.cc
+++ b/mojo/runner/shell_test_base.cc
@@ -52,9 +52,9 @@
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(application_url.spec());
shell_context_.application_manager()->ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(), GetProxy(&services),
- nullptr, shell::GetPermissiveCapabilityFilter(),
- base::Bind(&QuitIfRunning), shell::EmptyConnectCallback());
+ nullptr, request.Pass(), std::string(), GetProxy(&services), nullptr,
+ shell::GetPermissiveCapabilityFilter(), base::Bind(&QuitIfRunning),
+ shell::EmptyConnectCallback());
MessagePipe pipe;
services->ConnectToService(service_name, pipe.handle1.Pass());
return pipe.handle0.Pass();
diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc
index a7727d8..18aa4e0 100644
--- a/mojo/shell/application_instance.cc
+++ b/mojo/shell/application_instance.cc
@@ -95,7 +95,7 @@
if (!filter.is_null())
capability_filter = filter->filter.To<CapabilityFilter>();
manager_->ConnectToApplication(
- this, app_request.Pass(), std::string(), GURL(), services.Pass(),
+ this, app_request.Pass(), std::string(), services.Pass(),
exposed_services.Pass(), capability_filter, base::Closure(), callback);
} else {
LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index cb83401..0ef4345 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -73,22 +73,20 @@
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);
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index b28c18d..1f9bf0c 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -84,15 +84,15 @@
// |originator| can be NULL (e.g. for the first application or in tests), but
// typically is non-NULL and identifies the instance initiating the
// connection.
- // TODO(yzshen): Remove |requestor_url|.
+ // Please see the comments in connect_to_application_params.h for more details
+ // about the parameters.
void 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);
diff --git a/mojo/shell/capability_filter_unittest.cc b/mojo/shell/capability_filter_unittest.cc
index 3449e18..73a9588 100644
--- a/mojo/shell/capability_filter_unittest.cc
+++ b/mojo/shell/capability_filter_unittest.cc
@@ -350,7 +350,7 @@
URLRequestPtr request(URLRequest::New());
request->url = String::From(url);
application_manager_->ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(), GetProxy(&services),
+ nullptr, request.Pass(), std::string(), GetProxy(&services),
exposed_services.Pass(), filter,
base::MessageLoop::QuitWhenIdleClosure(), EmptyConnectCallback());
}