Revert 270867 "Mojo: Internalize ServiceConnector<>"

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/message_loop/message_loop.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/shell/application.h"
 #include "mojo/public/interfaces/shell/shell.mojom.h"
 #include "mojo/service_manager/service_loader.h"
 #include "mojo/service_manager/service_manager.h"
 #include "mojo/service_manager/test.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace {
 
 const char kTestURLString[] = "test:testService";
 
 struct TestContext {
   TestContext() : num_impls(0), num_loader_deletes(0) {}
   std::string last_test_string;
   int num_impls;
   int num_loader_deletes;
 };
 
-class TestServiceImpl : public InterfaceImpl<TestService> {
+class TestServiceImpl :
+    public ServiceConnection<TestService, TestServiceImpl, TestContext> {
  public:
-  explicit TestServiceImpl(TestContext* context) : context_(context) {
-    ++context_->num_impls;
+  virtual ~TestServiceImpl() {
+    if (context())
+      --context()->num_impls;
   }
 
-  virtual ~TestServiceImpl() {
-    --context_->num_impls;
-  }
-
-  // InterfaceImpl<TestService> implementation.
-  virtual void OnConnectionError() OVERRIDE {
+  void Initialize() {
+    if (context())
+      ++context()->num_impls;
   }
 
   // TestService implementation:
   virtual void Test(const mojo::String& test_string) OVERRIDE {
-    context_->last_test_string = test_string.To<std::string>();
+    context()->last_test_string = test_string.To<std::string>();
     client()->AckTest();
   }
-
- private:
-  TestContext* context_;
 };
 
 class TestClientImpl : public TestClient {
  public:
   explicit TestClientImpl(TestServicePtr service)
       : service_(service.Pass()),
         quit_after_ack_(false) {
     service_->SetClient(this);
   }
 
@@ skipping 36 matching lines @@
   }
 
   int num_loads() const { return num_loads_; }
 
  private:
   virtual void LoadService(ServiceManager* manager,
                            const GURL& url,
                            ScopedMessagePipeHandle shell_handle) OVERRIDE {
     ++num_loads_;
     test_app_.reset(new Application(shell_handle.Pass()));
-    test_app_->AddService<TestServiceImpl>(context_);
+    test_app_->AddServiceConnector(
+        new ServiceConnector<TestServiceImpl, TestContext>(context_));
   }
 
   virtual void OnServiceError(ServiceManager* manager,
                               const GURL& url) OVERRIDE {
     if (quit_after_error_) {
       base::MessageLoop::current()->PostTask(FROM_HERE,
                                              base::MessageLoop::QuitClosure());
     }
   }
 
@@ skipping 158 matching lines @@
 
   std::string url("test:test3");
   MessagePipe pipe1;
   sm.Connect(GURL(url), pipe1.handle0.Pass());
   EXPECT_EQ(1, interceptor.call_count());
   EXPECT_EQ(url, interceptor.url_spec());
   EXPECT_EQ(1, default_loader->num_loads());
 }
 
 }  // namespace mojo