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

trunk/src/mojo/service_manager/service_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/message_loop/message_loop.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 100 matching lines @@
     if (context_)
       ++context_->num_loader_deletes;
     test_app_.reset(NULL);
   }
 
   void set_context(TestContext* context) { context_ = context; }
   int num_loads() const { return num_loads_; }
 
  private:
   // ServiceLoader implementation.
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle service_provider_handle) OVERRIDE {
     ++num_loads_;
-    test_app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+    test_app_.reset(new ApplicationImpl(this, service_provider_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
   }
 
   // ApplicationDelegate implementation.
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) OVERRIDE {
     connection->AddService(this);
@@ skipping 188 matching lines @@
                public InterfaceFactory<TestA>,
                public InterfaceFactory<TestB>,
                public InterfaceFactory<TestC> {
  public:
   Tester(TesterContext* context, const std::string& requestor_url)
       : context_(context),
         requestor_url_(requestor_url) {}
   virtual ~Tester() {}
 
  private:
-  virtual void Load(ServiceManager* manager,
-                    const GURL& url,
-                    scoped_refptr<LoadCallbacks> callbacks) OVERRIDE {
-    app_.reset(
-        new ApplicationImpl(this, callbacks->RegisterApplication().Pass()));
+  virtual void LoadService(
+      ServiceManager* manager,
+      const GURL& url,
+      ScopedMessagePipeHandle shell_handle) OVERRIDE {
+    app_.reset(new ApplicationImpl(this, shell_handle.Pass()));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {}
 
   virtual bool ConfigureIncomingConnection(
       ApplicationConnection* connection) OVERRIDE {
     if (!requestor_url_.empty() &&
           requestor_url_ != connection->GetRemoteApplicationURL()) {
       context_->set_tester_called_quit();
@@ skipping 291 matching lines @@
   std::string url("test:test3");
   TestServicePtr test_service;
   service_manager_->ConnectToService(GURL(url), &test_service);
 
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 }  // namespace mojo