Some more minor cleanup to ApplicationManager.

mojo/shell/application_instance.cc

 // Copyright 2015 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_instance.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
 #include "mojo/common/common_type_converters.h"
@@ skipping 76 matching lines @@
   GURL url(url_string);
   if (!url.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << url_string;
     callback.Run(kInvalidContentHandlerID);
     return;
   }
   if (allow_any_application_ || filter_.find(url.spec()) != filter_.end()) {
     CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
     if (!filter.is_null())
       capability_filter = filter->filter.To<CapabilityFilter>();
-    manager_->ConnectToApplication(
-        this, app_request.Pass(), std::string(), services.Pass(),
-        exposed_services.Pass(), capability_filter, base::Closure(), callback);
+
+    scoped_ptr<ConnectToApplicationParams> params(
+        new ConnectToApplicationParams);
+    params->SetOriginatorInfo(this);
+    params->SetURLInfo(app_request.Pass());
+    params->set_services(services.Pass());
+    params->set_exposed_services(exposed_services.Pass());
+    params->set_filter(capability_filter);
+    params->set_connect_callback(callback);
+    manager_->ConnectToApplication(params.Pass());
   } else {
     LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
         identity_.url << " to: " << url.spec();
     callback.Run(kInvalidContentHandlerID);
   }
 }
 
 void ApplicationInstance::QuitApplication() {
   queue_requests_ = true;
   application_->OnQuitRequested(
@@ skipping 58 matching lines @@
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo