Revert "Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f"

third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc

Index: third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc
diff --git a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc
index 18cbea939a016f1ef31583244cfd8b0509e75f54..4e1cf697b429616647508e951f3f621cdc9bb4e8 100644
--- a/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc
+++ b/third_party/mojo/src/mojo/public/cpp/bindings/tests/versioning_apptest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/cpp/application/application_impl.h"
-#include "mojo/public/cpp/application/application_test_base.h"
+#include "mojo/application/public/cpp/application_impl.h"
+#include "mojo/application/public/cpp/application_test_base.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h"
 
@@ -45,7 +45,7 @@ TEST_F(VersioningApplicationTest, Struct) {
                              EXPECT_TRUE(employee->Equals(*returned_employee));
                              EXPECT_FALSE(returned_finger_print.is_null());
                            });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
 
   // Passing a struct of older version to the service side works.
   EmployeePtr new_employee(Employee::New());
@@ -55,7 +55,7 @@ TEST_F(VersioningApplicationTest, Struct) {
 
   database_->AddEmployee(new_employee.Clone(),
                          [](bool success) { EXPECT_TRUE(success); });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
 
   database_->QueryEmployee(
       2, false, [&new_employee](EmployeePtr returned_employee,
@@ -63,13 +63,13 @@ TEST_F(VersioningApplicationTest, Struct) {
         EXPECT_TRUE(new_employee->Equals(*returned_employee));
         EXPECT_TRUE(returned_finger_print.is_null());
       });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
 }
 
 TEST_F(VersioningApplicationTest, QueryVersion) {
   EXPECT_EQ(0u, database_.version());
   database_.QueryVersion([](uint32_t version) { EXPECT_EQ(1u, version); });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
   EXPECT_EQ(1u, database_.version());
 }
 
@@ -81,7 +81,7 @@ TEST_F(VersioningApplicationTest, RequireVersion) {
   database_->QueryEmployee(3, false,
                            [](EmployeePtr returned_employee,
                               Array<uint8_t> returned_finger_print) {});
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
   EXPECT_FALSE(database_.encountered_error());
 
   // Requiring a version higher than what the service side implements will close
@@ -91,7 +91,7 @@ TEST_F(VersioningApplicationTest, RequireVersion) {
   database_->QueryEmployee(1, false,
                            [](EmployeePtr returned_employee,
                               Array<uint8_t> returned_finger_print) {});
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
   EXPECT_TRUE(database_.encountered_error());
 }
 
@@ -107,12 +107,12 @@ TEST_F(VersioningApplicationTest, CallNonexistentMethod) {
   // supports version 1.
   database_->AttachFingerPrint(1, new_finger_print.Clone(),
                                [](bool success) { EXPECT_TRUE(success); });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
 
   // Calling a version 2 method (which the service side doesn't support) closes
   // the pipe.
   database_->ListEmployeeIds([](Array<uint64_t> ids) { EXPECT_TRUE(false); });
-  database_.WaitForIncomingResponse();
+  database_.WaitForIncomingMethodCall();
   EXPECT_TRUE(database_.encountered_error());
 }