Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

net/proxy/proxy_resolver_mojo_unittest.cc

 // Copyright 2015 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 "net/proxy/proxy_resolver_mojo.h"
 
 #include <list>
 #include <map>
 #include <queue>
 #include <string>
@@ skipping 230 matching lines @@
     case GetProxyForUrlAction::COMPLETE:
       client->ReportResult(action.error, action.proxy_servers.Pass());
       break;
     case GetProxyForUrlAction::DROP:
       client.reset();
       break;
     case GetProxyForUrlAction::DISCONNECT:
       binding_.Close();
       break;
     case GetProxyForUrlAction::WAIT_FOR_CLIENT_DISCONNECT:
-      ASSERT_FALSE(client.WaitForIncomingResponse());
+      ASSERT_FALSE(client.WaitForIncomingMethodCall());
       break;
     case GetProxyForUrlAction::SEND_LOAD_STATE_AND_BLOCK:
       client->LoadStateChanged(LOAD_STATE_RESOLVING_HOST_IN_PROXY_SCRIPT);
       blocked_clients_.push_back(
           new interfaces::ProxyResolverRequestClientPtr(client.Pass()));
       break;
   }
   WakeWaiter();
 }
 
@@ skipping 131 matching lines @@
       break;
     case CreateProxyResolverAction::DROP_RESOLVER:
       // Save |client| so its pipe isn't closed.
       blocked_clients_.push_back(
           new interfaces::ProxyResolverFactoryRequestClientPtr(client.Pass()));
       break;
     case CreateProxyResolverAction::DROP_BOTH:
       // Both |request| and |client| will be closed.
       break;
     case CreateProxyResolverAction::WAIT_FOR_CLIENT_DISCONNECT:
-      ASSERT_FALSE(client.WaitForIncomingResponse());
+      ASSERT_FALSE(client.WaitForIncomingMethodCall());
       break;
   }
   WakeWaiter();
 }
 
 }  // namespace
 
 class ProxyResolverMojoTest : public testing::Test,
                               public MojoProxyResolverFactory {
  public:
@@ skipping 324 matching lines @@
                 &handle, net_log)));
   on_delete_callback_.WaitForResult();
 }
 
 TEST_F(ProxyResolverMojoTest, DeleteResolver) {
   CreateProxyResolver();
   proxy_resolver_mojo_.reset();
   on_delete_callback_.WaitForResult();
 }
 }  // namespace net