Simplify the ApplicationLoader interface in preparation for changes.

shell/application_manager/application_manager_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/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
@@ skipping 94 matching lines @@
       ++context_->num_loader_deletes;
     test_app_.reset(NULL);
   }
 
   void set_context(TestContext* context) { context_ = context; }
   int num_loads() const { return num_loads_; }
   const std::vector<std::string>& GetArgs() const { return test_app_->args(); }
 
  private:
   // ApplicationLoader implementation.
-  void Load(ApplicationManager* manager,
-            const GURL& url,
-            InterfaceRequest<Application> application_request,
-            LoadCallback callback) override {
+  void Load(const GURL& url,
+            InterfaceRequest<Application> application_request) override {
     ++num_loads_;
     test_app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   // ApplicationDelegate implementation.
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     connection->AddService(this);
@@ skipping 198 matching lines @@
                public ApplicationLoader,
                public InterfaceFactory<TestA>,
                public InterfaceFactory<TestB>,
                public InterfaceFactory<TestC> {
  public:
   Tester(TesterContext* context, const std::string& requestor_url)
       : context_(context), requestor_url_(requestor_url) {}
   ~Tester() override {}
 
  private:
-  void Load(ApplicationManager* manager,
-            const GURL& url,
-            InterfaceRequest<Application> application_request,
-            LoadCallback callback) override {
+  void Load(const GURL& url,
+            InterfaceRequest<Application> application_request) override {
     app_.reset(new ApplicationImpl(this, application_request.Pass()));
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   bool ConfigureIncomingConnection(ApplicationConnection* connection) override {
     if (!requestor_url_.empty() &&
         requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
@@ skipping 386 matching lines @@
                                                     application.Pass());
   loop_.Run();
   EXPECT_EQ(args, external.initialize_args());
   application_manager_->ConnectToServiceByName(GURL("mojo:test"),
                                                std::string());
   loop_.Run();
   EXPECT_TRUE(external.configure_incoming_connection_called());
 };
 
 }  // namespace mojo