Revert of Some more minor cleanup to ApplicationManager.

mojo/fetcher/about_fetcher_unittest.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 "base/at_exit.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 94 matching lines @@
         GetProxy(&service_provider);
     // This connection error handler will be called when:
     // - TestContentHandler::StartApplication() has been called (please see
     //   comments in that method); or
     // - the application manager fails to fetch the requested URL.
     service_provider.set_connection_error_handler(
         [&run_loop]() { run_loop.Quit(); });
 
     URLRequestPtr request(URLRequest::New());
     request->url = url;
-
-    scoped_ptr<shell::ConnectToApplicationParams> params(
-        new shell::ConnectToApplicationParams);
-    params->SetURLInfo(request.Pass());
-    params->set_services(service_provider_request.Pass());
-    application_manager_->ConnectToApplication(params.Pass());
+    application_manager_->ConnectToApplication(
+        nullptr, request.Pass(), std::string(), service_provider_request.Pass(),
+        nullptr, shell::CapabilityFilter(), base::Closure(),
+        shell::EmptyConnectCallback());
 
     run_loop.Run();
   }
 
   // Overridden from testing::Test:
   void SetUp() override {
     runner::Context::EnsureEmbedderIsInitialized();
     base::FilePath shell_dir;
     PathService::Get(base::DIR_MODULE, &shell_dir);
     scoped_ptr<package_manager::PackageManagerImpl> package_manager(
@@ skipping 38 matching lines @@
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
 }  // namespace fetcher
 }  // namespace mojo