Simplify the ApplicationLoader interface in preparation for changes.

shell/android/background_application_loader_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 "shell/android/background_application_loader.h"
 
 #include "mojo/public/interfaces/application/application.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 namespace {
 
 class DummyLoader : public ApplicationLoader {
  public:
   DummyLoader() : simulate_app_quit_(true) {}
   ~DummyLoader() override {}
 
   // ApplicationLoader overrides:
-  void Load(ApplicationManager* manager,
-            const GURL& url,
-            InterfaceRequest<Application> application_request,
-            LoadCallback callback) override {
+  void Load(const GURL& url,
+            InterfaceRequest<Application> application_request) override {
     if (simulate_app_quit_)
       base::MessageLoop::current()->Quit();
   }
 
   void OnApplicationError(ApplicationManager* manager,
                           const GURL& url) override {}
 
   void DontSimulateAppQuit() { simulate_app_quit_ = false; }
 
  private:
   bool simulate_app_quit_;
 };
 
 }  // namespace
 
 // Tests that the loader can start and stop gracefully.
 TEST(BackgroundApplicationLoaderTest, StartStop) {
   scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
   BackgroundApplicationLoader loader(real_loader.Pass(), "test",
                                      base::MessageLoop::TYPE_DEFAULT);
 }
 
 // Tests that the loader can load a service that is well behaved (quits
 // itself).
 TEST(BackgroundApplicationLoaderTest, Load) {
   scoped_ptr<ApplicationLoader> real_loader(new DummyLoader());
   BackgroundApplicationLoader loader(real_loader.Pass(), "test",
                                      base::MessageLoop::TYPE_DEFAULT);
   ApplicationPtr application;
-  loader.Load(NULL, GURL(), GetProxy(&application),
-              ApplicationLoader::SimpleLoadCallback());
+  loader.Load(GURL(), GetProxy(&application));
 }
 
 }  // namespace mojo