Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0"

third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc

Index: third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
diff --git a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
index 3675f973c42e050c8bfe2f9eb8557fef1e598a7b..1da70c218462801a30b17d7b23141766a4f476c2 100644
--- a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
+++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
@@ -193,11 +193,11 @@ void CheckCorruptedEchoArgsList(const js_to_cpp::EchoArgsListPtr& list) {
 // run_loop().
 class CppSideConnection : public js_to_cpp::CppSide {
  public:
-  CppSideConnection()
-      : run_loop_(nullptr),
-        js_side_(nullptr),
-        mishandled_messages_(0),
-        binding_(this) {}
+  CppSideConnection() :
+      run_loop_(NULL),
+      js_side_(NULL),
+      mishandled_messages_(0) {
+  }
   ~CppSideConnection() override {}
 
   void set_run_loop(base::RunLoop* run_loop) { run_loop_ = run_loop; }
@@ -206,12 +206,6 @@ class CppSideConnection : public js_to_cpp::CppSide {
   void set_js_side(js_to_cpp::JsSide* js_side) { js_side_ = js_side; }
   js_to_cpp::JsSide* js_side() { return js_side_; }
 
-  void Bind(InterfaceRequest<js_to_cpp::CppSide> request) {
-    binding_.Bind(request.Pass());
-    // Keep the pipe open even after validation errors.
-    binding_.internal_router()->EnableTestingMode();
-  }
-
   // js_to_cpp::CppSide:
   void StartTest() override { NOTREACHED(); }
 
@@ -235,7 +229,6 @@ class CppSideConnection : public js_to_cpp::CppSide {
   base::RunLoop* run_loop_;
   js_to_cpp::JsSide* js_side_;
   int mishandled_messages_;
-  mojo::Binding<js_to_cpp::CppSide> binding_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CppSideConnection);
@@ -370,22 +363,21 @@ class JsToCppTest : public testing::Test {
   void RunTest(const std::string& test, CppSideConnection* cpp_side) {
     cpp_side->set_run_loop(&run_loop_);
 
-    js_to_cpp::JsSidePtr js_side;
-    auto js_side_proxy = GetProxy(&js_side);
+    MessagePipe pipe;
+    js_to_cpp::JsSidePtr js_side =
+        MakeProxy<js_to_cpp::JsSide>(pipe.handle0.Pass());
+    js_side.set_client(cpp_side);
 
-    cpp_side->set_js_side(js_side.get());
-    js_to_cpp::CppSidePtr cpp_side_ptr;
-    cpp_side->Bind(GetProxy(&cpp_side_ptr));
+    js_side.internal_state()->router_for_testing()->EnableTestingMode();
 
-    js_side->SetCppSide(cpp_side_ptr.Pass());
+    cpp_side->set_js_side(js_side.get());
 
     gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode,
                                    gin::ArrayBufferAllocator::SharedInstance());
     gin::IsolateHolder instance;
     MojoRunnerDelegate delegate;
     gin::ShellRunner runner(&delegate, instance.isolate());
-    delegate.Start(&runner, js_side_proxy.PassMessagePipe().release().value(),
-                   test);
+    delegate.Start(&runner, pipe.handle1.release().value(), test);
 
     run_loop_.Run();
   }