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

Unified Diff: third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.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
Index: third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
index 09e481242cfd266eb8c8e1788b5d3a9df4a93899..57abf8fd835edf4780c87f5f754932825c7d31be 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
@@ -87,8 +87,8 @@ class MathCalculatorUI {
output_(0.0),
callback_(MakeRunnable(&MathCalculatorUI::Output, this)) {}
- bool WaitForIncomingMethodCall() {
- return calculator_.WaitForIncomingMethodCall();
+ bool WaitForIncomingResponse() {
+ return calculator_.WaitForIncomingResponse();
}
bool encountered_error() const { return calculator_.encountered_error(); }
@@ -232,13 +232,13 @@ TEST_F(InterfacePtrTest, EndToEnd_Synchronous) {
calculator_ui.Add(2.0);
EXPECT_EQ(0.0, calculator_ui.GetOutput());
calc_impl.WaitForIncomingMethodCall();
- calculator_ui.WaitForIncomingMethodCall();
+ calculator_ui.WaitForIncomingResponse();
EXPECT_EQ(2.0, calculator_ui.GetOutput());
calculator_ui.Multiply(5.0);
EXPECT_EQ(2.0, calculator_ui.GetOutput());
calc_impl.WaitForIncomingMethodCall();
- calculator_ui.WaitForIncomingMethodCall();
+ calculator_ui.WaitForIncomingResponse();
EXPECT_EQ(10.0, calculator_ui.GetOutput());
}

Powered by Google App Engine
This is Rietveld 408576698