Revert 270867 "Mojo: Internalize ServiceConnector<>"

trunk/src/mojo/public/cpp/bindings/lib/interface_impl_internal.h

 // 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.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_IMPL_INTERNAL_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_IMPL_INTERNAL_H_
 
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/lib/filter_chain.h"
 #include "mojo/public/cpp/bindings/lib/message_header_validator.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename Interface>
-class InterfaceImplBase : public Interface {
- public:
-  virtual ~InterfaceImplBase() {}
-  virtual void OnConnectionEstablished() = 0;
-  virtual void OnConnectionError() = 0;
-};
-
-template <typename Interface>
 class InterfaceImplState : public ErrorHandler {
  public:
   typedef typename Interface::Client Client;
 
-  explicit InterfaceImplState(InterfaceImplBase<Interface>* instance)
+  explicit InterfaceImplState(WithErrorHandler<Interface>* instance)
       : router_(NULL),
         client_(NULL),
         proxy_(NULL) {
     assert(instance);
     stub_.set_sink(instance);
   }
 
   virtual ~InterfaceImplState() {
     delete proxy_;
     if (router_) {
@@ skipping 18 matching lines @@
     filters.Append(new MessageHeaderValidator)
            .Append(new typename Interface::RequestValidator_)
            .Append(new typename Interface::Client::ResponseValidator_);
 
     router_ = new Router(handle.Pass(), filters.Pass(), waiter);
     router_->set_incoming_receiver(&stub_);
     router_->set_error_handler(this);
 
     proxy_ = new typename Client::Proxy_(router_);
 
-    instance()->SetClient(proxy_);
-    instance()->OnConnectionEstablished();
+    stub_.sink()->SetClient(proxy_);
   }
 
   Router* router() { return router_; }
 
   void set_client(Client* client) { client_ = client; }
   Client* client() { return client_; }
 
  private:
-  InterfaceImplBase<Interface>* instance() {
-    return static_cast<InterfaceImplBase<Interface>*>(stub_.sink());
-  }
-
   virtual void OnConnectionError() MOJO_OVERRIDE {
-    instance()->OnConnectionError();
+    static_cast<WithErrorHandler<Interface>*>(stub_.sink())->
+        OnConnectionError();
   }
 
   Router* router_;
   Client* client_;
   typename Client::Proxy_* proxy_;
   typename Interface::Stub_ stub_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(InterfaceImplState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_IMPL_INTERNAL_H_