Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

mojo/runner/shell_apptest.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 "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
@@ skipping 73 matching lines @@
     local_address->ipv4->addr.resize(4);
     local_address->ipv4->addr[0] = 127;
     local_address->ipv4->addr[1] = 0;
     local_address->ipv4->addr[2] = 0;
     local_address->ipv4->addr[3] = 1;
     local_address->ipv4->port = 0;
     http_server_factory_->CreateHttpServer(GetProxy(&http_server_),
                                            local_address.Pass());
 
     http_server_->GetPort([this](uint16_t p) { port_ = p; });
-    EXPECT_TRUE(http_server_.WaitForIncomingResponse());
+    EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
 
     InterfacePtr<http_server::HttpHandler> http_handler;
     handler_.reset(new GetHandler(GetProxy(&http_handler).Pass(), port_));
     http_server_->SetHandler(".*", http_handler.Pass(),
                              [](bool result) { EXPECT_TRUE(result); });
-    EXPECT_TRUE(http_server_.WaitForIncomingResponse());
+    EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
   }
 
   std::string GetURL(const std::string& path) {
     return ::mojo::GetURL(port_, path);
   }
 
   http_server::HttpServerFactoryPtr http_server_factory_;
   http_server::HttpServerPtr http_server_;
   scoped_ptr<GetHandler> handler_;
   uint16_t port_;
@@ skipping 77 matching lines @@
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->Quit();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 }  // namespace
 }  // namespace mojo