Revert 288013 "First cut at "content handling" support in Mojo."

trunk/src/mojo/service_manager/background_shell_service_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 "mojo/service_manager/background_shell_service_loader.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 namespace {
 
 class DummyLoader : public ServiceLoader {
  public:
   DummyLoader() : simulate_app_quit_(true) {}
   virtual ~DummyLoader() {}
 
   // ServiceLoader overrides:
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+  virtual void LoadService(ServiceManager* manager,
+                           const GURL& url,
+                           ScopedMessagePipeHandle shell_handle) OVERRIDE {
     if (simulate_app_quit_)
       base::MessageLoop::current()->Quit();
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   void DontSimulateAppQuit() { simulate_app_quit_ = false; }
 
@@ skipping 10 matching lines @@
                                       base::MessageLoop::TYPE_DEFAULT);
 }
 
 // Tests that the loader can load a service that is well behaved (quits
 // itself).
 TEST(BackgroundShellServiceLoaderTest, Load) {
   scoped_ptr<ServiceLoader> real_loader(new DummyLoader());
   BackgroundShellServiceLoader loader(real_loader.Pass(), "test",
                                       base::MessageLoop::TYPE_DEFAULT);
   MessagePipe dummy;
-  scoped_refptr<ServiceLoader::SimpleLoadCallbacks> callbacks(
-      new ServiceLoader::SimpleLoadCallbacks(dummy.handle0.Pass()));
-  loader.Load(NULL, GURL(), callbacks);
+  loader.LoadService(NULL, GURL(), dummy.handle0.Pass());
 }
 
 }  // namespace mojo