Some more minor cleanup to ApplicationManager.

mojo/runner/native_runner_unittest.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 "base/files/scoped_temp_dir.h"
 #include "base/path_service.h"
 #include "mojo/runner/context.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 76 matching lines @@
 
 TEST_F(NativeApplicationLoaderTest, DoesNotExist) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath nonexistent_file(FILE_PATH_LITERAL("nonexistent.txt"));
   GURL url(util::FilePathToFileURL(temp_dir.path().Append(nonexistent_file)));
   InterfaceRequest<ServiceProvider> services;
   ServiceProviderPtr service_provider;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(url.spec());
-  context_->application_manager()->ConnectToApplication(
-      nullptr, request.Pass(), std::string(), services.Pass(),
-      service_provider.Pass(), shell::GetPermissiveCapabilityFilter(),
-      base::Closure(), shell::EmptyConnectCallback());
+
+  scoped_ptr<shell::ConnectToApplicationParams> params(
+      new shell::ConnectToApplicationParams);
+  params->SetURLInfo(request.Pass());
+  params->set_services(services.Pass());
+  params->set_exposed_services(service_provider.Pass());
+  params->set_filter(shell::GetPermissiveCapabilityFilter());
+  context_->application_manager()->ConnectToApplication(params.Pass());
   EXPECT_FALSE(state_.runner_was_created);
   EXPECT_FALSE(state_.runner_was_started);
   EXPECT_FALSE(state_.runner_was_destroyed);
 }
 
 }  // namespace
 }  // namespace runner
 }  // namespace mojo