Group ConnectToApplication-related info into a params struct.

mojo/runner/context.cc

 // Copyright 2013 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/runner/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 19 matching lines @@
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/runner/about_fetcher.h"
 #include "mojo/runner/in_process_native_runner.h"
 #include "mojo/runner/out_of_process_native_runner.h"
 #include "mojo/runner/switches.h"
 #include "mojo/services/tracing/public/cpp/switches.h"
 #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"
 
 namespace mojo {
 namespace runner {
 namespace {
 
 // Used to ensure we only init once.
 class Setup {
@@ skipping 134 matching lines @@
       command_line.GetSwitchValueASCII(devtools_service::kRemoteDebuggingPort);
   unsigned port;
   if (!base::StringToUint(port_str, &port) || port > 65535) {
     LOG(ERROR) << "Invalid value for switch "
                << devtools_service::kRemoteDebuggingPort << ": '" << port_str
                << "' is not a valid port number.";
     return;
   }
 
   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(
       devtools_service::DevToolsCoordinator::Name_,
       GetProxy(&devtools_coordinator).PassMessagePipe());
   devtools_coordinator->Initialize(static_cast<uint16_t>(port));
 }
 
 class TracingServiceProvider : public ServiceProvider {
  public:
@@ skipping 201 matching lines @@
         base::MessageLoop::current()->Quit();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo