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

trunk/src/mojo/services/window_manager/window_manager_api_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/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/services/public/cpp/view_manager/node.h"
@@ skipping 110 matching lines @@
  public:
   typedef base::Callback<void(Node*)> RootAddedCallback;
 
   explicit TestServiceLoader(const RootAddedCallback& root_added_callback)
       : root_added_callback_(root_added_callback),
         view_manager_client_factory_(this) {}
   virtual ~TestServiceLoader() {}
 
  private:
   // Overridden from ServiceLoader:
-  virtual void Load(ServiceManager* service_manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) MOJO_OVERRIDE {
-    ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
-    if (!shell_handle.is_valid())
-      return;
+  virtual void LoadService(ServiceManager* service_manager,
+                           const GURL& url,
+                           ScopedMessagePipeHandle shell_handle) MOJO_OVERRIDE {
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, shell_handle.Pass()));
     apps_.push_back(app.release());
   }
   virtual void OnServiceError(ServiceManager* service_manager,
                               const GURL& url) MOJO_OVERRIDE {
   }
 
   // Overridden from ApplicationDelegate:
   virtual bool ConfigureIncomingConnection(
@@ skipping 149 matching lines @@
 
   Id second_window = OpenWindow(window_manager_.get());
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   ids = WaitForActiveWindowChange();
   EXPECT_EQ(ids.first, first_window);
   EXPECT_EQ(ids.second, second_window);
 }
 
 }  // namespace mojo