Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(439)

Unified Diff: mojo/runner/shell_apptest.cc

Issue 1142043005: Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix type conversion errors on win64 for some msvs Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/environment/default_logger_impl.cc ('k') | mojo/services/network/http_server_apptest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/shell_apptest.cc
diff --git a/mojo/runner/shell_apptest.cc b/mojo/runner/shell_apptest.cc
index 38519ef162ce92fe6db9ec180b58f12291990b07..a2bf37db4022aa3b20fc278992b4b8b47d3a78c9 100644
--- a/mojo/runner/shell_apptest.cc
+++ b/mojo/runner/shell_apptest.cc
@@ -91,13 +91,13 @@ class ShellHTTPAppTest : public test::ApplicationTestBase {
local_address.Pass());
http_server_->GetPort([this](uint16_t p) { port_ = p; });
- EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(http_server_.WaitForIncomingResponse());
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_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(http_server_.WaitForIncomingResponse());
}
std::string GetURL(const std::string& path) {
« no previous file with comments | « mojo/environment/default_logger_impl.cc ('k') | mojo/services/network/http_server_apptest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698