Revert 270867 "Mojo: Internalize ServiceConnector<>"

trunk/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc

 // Copyright 2013 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/public/cpp/bindings/error_handler.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/interfaces/bindings/tests/math_calculator.mojom.h"
 #include "mojo/public/interfaces/bindings/tests/sample_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 14 matching lines @@
   }
 
  private:
   bool encountered_error_;
 };
 
 class MathCalculatorImpl : public InterfaceImpl<math::Calculator> {
  public:
   virtual ~MathCalculatorImpl() {}
 
-  MathCalculatorImpl()
-      : total_(0.0),
-        got_connection_(false) {
-  }
-
-  virtual void OnConnectionEstablished() MOJO_OVERRIDE {
-    got_connection_ = true;
+  MathCalculatorImpl() : total_(0.0) {
   }
 
   virtual void OnConnectionError() MOJO_OVERRIDE {
     delete this;
   }
 
   virtual void Clear() MOJO_OVERRIDE {
     client()->Output(total_);
   }
 
   virtual void Add(double value) MOJO_OVERRIDE {
     total_ += value;
     client()->Output(total_);
   }
 
   virtual void Multiply(double value) MOJO_OVERRIDE {
     total_ *= value;
     client()->Output(total_);
   }
 
-  bool got_connection() const {
-    return got_connection_;
-  }
-
-private:
+ private:
   double total_;
-  bool got_connection_;
 };
 
 class MathCalculatorUIImpl : public math::CalculatorUI {
  public:
   explicit MathCalculatorUIImpl(math::CalculatorPtr calculator)
       : calculator_(calculator.Pass()),
         output_(0.0) {
     calculator_->SetClient(this);
   }
 
@@ skipping 41 matching lines @@
     loop_.RunUntilIdle();
   }
 
  private:
   Environment env_;
   RunLoop loop_;
 };
 
 TEST_F(InterfacePtrTest, EndToEnd) {
   math::CalculatorPtr calc;
-  MathCalculatorImpl* impl = BindToProxy(new MathCalculatorImpl(), &calc);
-  EXPECT_TRUE(impl->got_connection());
+  BindToProxy(new MathCalculatorImpl(), &calc);
 
   // Suppose this is instantiated in a process that has pipe1_.
   MathCalculatorUIImpl calculator_ui(calc.Pass());
 
   calculator_ui.Add(2.0);
   calculator_ui.Multiply(5.0);
 
   PumpMessages();
 
   EXPECT_EQ(10.0, calculator_ui.GetOutput());
@@ skipping 99 matching lines @@
   // This is a test to ensure the following compiles. The sample::Port interface
   // does not have an explicit Client attribute.
   sample::PortPtr port;
   MessagePipe pipe;
   port.Bind(pipe.handle0.Pass());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo