Remove some InterfacePtr<> methods which directly deal with message pipe handles.

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/binding.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/cpp/bindings/strong_binding.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"
@@ skipping 248 matching lines @@
 TEST_F(InterfacePtrTest, Resettable) {
   math::CalculatorPtr a;
 
   EXPECT_TRUE(!a);
 
   MessagePipe pipe;
 
   // Save this so we can test it later.
   Handle handle = pipe.handle0.get();
 
-  a = MakeProxy<math::Calculator>(pipe.handle0.Pass());
+  a = MakeProxy(InterfacePtrInfo<math::Calculator>(pipe.handle0.Pass(), 0u));
 
   EXPECT_FALSE(!a);
 
   a.reset();
 
   EXPECT_TRUE(!a);
   EXPECT_FALSE(a.internal_state()->router_for_testing());
 
   // Test that handle was closed.
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, CloseRaw(handle));
 }
 
 TEST_F(InterfacePtrTest, BindInvalidHandle) {
   math::CalculatorPtr ptr;
   EXPECT_FALSE(ptr.get());
   EXPECT_FALSE(ptr);
 
-  ptr.Bind(ScopedMessagePipeHandle());
+  ptr.Bind(InterfacePtrInfo<math::Calculator>());
   EXPECT_FALSE(ptr.get());
   EXPECT_FALSE(ptr);
 }
 
 TEST_F(InterfacePtrTest, EncounteredError) {
   math::CalculatorPtr proxy;
   MathCalculatorImpl calc_impl(GetProxy(&proxy));
 
   MathCalculatorUI calculator_ui(proxy.Pass());
 
@@ skipping 181 matching lines @@
   Environment env;
   RunLoop loop;
 
   bool error_received = false;
   bool destroyed = false;
   MessagePipe pipe;
   new StrongMathCalculatorImpl(pipe.handle0.Pass(), &error_received,
                                &destroyed);
 
   math::CalculatorPtr calc;
-  calc.Bind(pipe.handle1.Pass());
+  calc.Bind(InterfacePtrInfo<math::Calculator>(pipe.handle1.Pass(), 0u));
 
   {
     // Suppose this is instantiated in a process that has the other end of the
     // message pipe.
     MathCalculatorUI calculator_ui(calc.Pass());
 
     calculator_ui.Add(2.0);
     calculator_ui.Multiply(5.0);
 
     loop.RunUntilIdle();
@@ skipping 49 matching lines @@
 TEST(WeakConnectorTest, Math) {
   Environment env;
   RunLoop loop;
 
   bool error_received = false;
   bool destroyed = false;
   MessagePipe pipe;
   WeakMathCalculatorImpl impl(pipe.handle0.Pass(), &error_received, &destroyed);
 
   math::CalculatorPtr calc;
-  calc.Bind(pipe.handle1.Pass());
+  calc.Bind(InterfacePtrInfo<math::Calculator>(pipe.handle1.Pass(), 0u));
 
   {
     // Suppose this is instantiated in a process that has the other end of the
     // message pipe.
     MathCalculatorUI calculator_ui(calc.Pass());
 
     calculator_ui.Add(2.0);
     calculator_ui.Multiply(5.0);
 
     loop.RunUntilIdle();
 
     EXPECT_EQ(10.0, calculator_ui.GetOutput());
     EXPECT_FALSE(error_received);
     EXPECT_FALSE(destroyed);
     // Destroying calculator_ui should close the pipe and generate an error on
     // the other
     // end which will destroy the instance since it is strongly bound.
   }
 
   loop.RunUntilIdle();
   EXPECT_TRUE(error_received);
   EXPECT_FALSE(destroyed);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo