Index: mojo/runner/context.cc |
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc |
index fd93119494bdc0f3535e267ae523f5d87a517734..20babc9c188e0e3953c8d9b1cfb665a53b07a581 100644 |
--- a/mojo/runner/context.cc |
+++ b/mojo/runner/context.cc |
@@ -37,6 +37,7 @@ |
#include "mojo/services/tracing/public/interfaces/tracing.mojom.h" |
#include "mojo/shell/application_loader.h" |
#include "mojo/shell/application_manager.h" |
+#include "mojo/shell/connect_to_application_params.h" |
#include "mojo/shell/switches.h" |
#include "mojo/util/filename_util.h" |
#include "url/gurl.h" |
@@ -191,13 +192,14 @@ void InitDevToolsServiceIfNeeded(shell::ApplicationManager* manager, |
} |
ServiceProviderPtr devtools_service_provider; |
- URLRequestPtr request(URLRequest::New()); |
- request->url = "mojo:devtools_service"; |
- manager->ConnectToApplication(nullptr, request.Pass(), std::string(), |
- GURL("mojo:shell"), |
- GetProxy(&devtools_service_provider), nullptr, |
- shell::GetPermissiveCapabilityFilter(), |
- base::Closure(), shell::EmptyConnectCallback()); |
+ scoped_ptr<shell::ConnectToApplicationParams> params( |
+ new shell::ConnectToApplicationParams); |
+ params->set_originator_identity(shell::Identity(GURL("mojo:shell"))); |
+ params->set_originator_filter(shell::GetPermissiveCapabilityFilter()); |
+ params->SetURLInfo(GURL("mojo:devtools_service")); |
+ params->set_services(GetProxy(&devtools_service_provider)); |
+ params->set_filter(shell::GetPermissiveCapabilityFilter()); |
+ manager->ConnectToApplication(params.Pass()); |
devtools_service::DevToolsCoordinatorPtr devtools_coordinator; |
devtools_service_provider->ConnectToService( |