Rename InterfacePtr's WaitForIncomingMethodCall() -> WaitForIncomingResponse().
R=jamesr@chromium.org
Review URL: https://codereview.chromium.org/1150563003
diff --git a/examples/apptest/example_apptest.cc b/examples/apptest/example_apptest.cc
index 1f57fdd..3b760c5 100644
--- a/examples/apptest/example_apptest.cc
+++ b/examples/apptest/example_apptest.cc
@@ -37,7 +37,7 @@
uint16_t pong_value = 0u;
example_service_->Ping(1u,
[&pong_value](uint16_t value) { pong_value = value; });
- EXPECT_TRUE(example_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(example_service_.WaitForIncomingResponse());
// Test making a call and receiving the reply.
EXPECT_EQ(1u, pong_value);
}
diff --git a/examples/surfaces_app/child_impl.cc b/examples/surfaces_app/child_impl.cc
index 5577fcd..e4e35f0 100644
--- a/examples/surfaces_app/child_impl.cc
+++ b/examples/surfaces_app/child_impl.cc
@@ -36,7 +36,7 @@
surfaces_service_connection->ConnectToService(&surface_);
surface_->GetIdNamespace(
base::Bind(&ChildImpl::SetIdNamespace, base::Unretained(this)));
- surface_.WaitForIncomingMethodCall(); // Wait for ID namespace to arrive.
+ surface_.WaitForIncomingResponse(); // Wait for ID namespace to arrive.
DCHECK_NE(0u, id_namespace_);
}
diff --git a/mojo/icu/icu.cc b/mojo/icu/icu.cc
index 454d5f6..079d19b 100644
--- a/mojo/icu/icu.cc
+++ b/mojo/icu/icu.cc
@@ -44,7 +44,7 @@
icu_data::ICUDataPtr icu_data;
app->ConnectToService("mojo:icu_data", &icu_data);
icu_data->Map(kDataHash, Callback());
- icu_data.WaitForIncomingMethodCall();
+ icu_data.WaitForIncomingResponse();
}
} // namespace icu
diff --git a/mojo/public/cpp/bindings/interface_ptr.h b/mojo/public/cpp/bindings/interface_ptr.h
index f7323e8..cdca105 100644
--- a/mojo/public/cpp/bindings/interface_ptr.h
+++ b/mojo/public/cpp/bindings/interface_ptr.h
@@ -115,10 +115,8 @@
//
// This method may only be called after the InterfacePtr has been bound to a
// message pipe.
- //
- // TODO(jamesr): Rename to WaitForIncomingResponse().
- bool WaitForIncomingMethodCall() {
- return internal_state_.WaitForIncomingMethodCall();
+ bool WaitForIncomingResponse() {
+ return internal_state_.WaitForIncomingResponse();
}
// Indicates whether the message pipe has encountered an error. If true,
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
index cd3803f..e88084f 100644
--- a/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
+++ b/mojo/public/cpp/bindings/lib/interface_ptr_internal.h
@@ -91,7 +91,7 @@
version_ = info.version();
}
- bool WaitForIncomingMethodCall() {
+ bool WaitForIncomingResponse() {
ConfigureProxyIfNecessary();
MOJO_DCHECK(router_);
diff --git a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
index 09e4812..57abf8f 100644
--- a/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/interface_ptr_unittest.cc
@@ -87,8 +87,8 @@
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 @@
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());
}
diff --git a/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
index c3629a2..18cbea9 100644
--- a/mojo/public/cpp/bindings/tests/versioning_apptest.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
@@ -45,7 +45,7 @@
EXPECT_TRUE(employee->Equals(*returned_employee));
EXPECT_FALSE(returned_finger_print.is_null());
});
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
// Passing a struct of older version to the service side works.
EmployeePtr new_employee(Employee::New());
@@ -55,7 +55,7 @@
database_->AddEmployee(new_employee.Clone(),
[](bool success) { EXPECT_TRUE(success); });
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
database_->QueryEmployee(
2, false, [&new_employee](EmployeePtr returned_employee,
@@ -63,13 +63,13 @@
EXPECT_TRUE(new_employee->Equals(*returned_employee));
EXPECT_TRUE(returned_finger_print.is_null());
});
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
}
TEST_F(VersioningApplicationTest, QueryVersion) {
EXPECT_EQ(0u, database_.version());
database_.QueryVersion([](uint32_t version) { EXPECT_EQ(1u, version); });
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
EXPECT_EQ(1u, database_.version());
}
@@ -81,7 +81,7 @@
database_->QueryEmployee(3, false,
[](EmployeePtr returned_employee,
Array<uint8_t> returned_finger_print) {});
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
EXPECT_FALSE(database_.encountered_error());
// Requiring a version higher than what the service side implements will close
@@ -91,7 +91,7 @@
database_->QueryEmployee(1, false,
[](EmployeePtr returned_employee,
Array<uint8_t> returned_finger_print) {});
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
EXPECT_TRUE(database_.encountered_error());
}
@@ -107,12 +107,12 @@
// supports version 1.
database_->AttachFingerPrint(1, new_finger_print.Clone(),
[](bool success) { EXPECT_TRUE(success); });
- database_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
// 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_.WaitForIncomingMethodCall();
+ database_.WaitForIncomingResponse();
EXPECT_TRUE(database_.encountered_error());
}
diff --git a/mojo/services/files/public/c/lib/directory_wrapper.cc b/mojo/services/files/public/c/lib/directory_wrapper.cc
index cf1be69..d67615d 100644
--- a/mojo/services/files/public/c/lib/directory_wrapper.cc
+++ b/mojo/services/files/public/c/lib/directory_wrapper.cc
@@ -74,7 +74,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
directory_->OpenFile(path, mojo::GetProxy(&file), mojo_open_flags,
Capture(&error));
- if (!directory_.WaitForIncomingMethodCall()) {
+ if (!directory_.WaitForIncomingResponse()) {
// This may be somewhat surprising. The implication is that the CWD is
// stale, which may be a little strange.
errno_setter.Set(ESTALE);
@@ -98,7 +98,7 @@
path, mojo::GetProxy(&new_directory),
mojo::files::kOpenFlagRead | mojo::files::kOpenFlagWrite,
Capture(&error));
- if (!directory_.WaitForIncomingMethodCall()) {
+ if (!directory_.WaitForIncomingResponse()) {
// This may be somewhat surprising. The implication is that the CWD is
// stale, which may be a little strange.
return errno_setter.Set(ESTALE);
diff --git a/mojo/services/files/public/c/lib/file_fd_impl.cc b/mojo/services/files/public/c/lib/file_fd_impl.cc
index 58d957c..801da14 100644
--- a/mojo/services/files/public/c/lib/file_fd_impl.cc
+++ b/mojo/services/files/public/c/lib/file_fd_impl.cc
@@ -33,7 +33,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
file_->Close(Capture(&error));
- if (!file_.WaitForIncomingMethodCall())
+ if (!file_.WaitForIncomingResponse())
return errno_setter.Set(ESTALE);
return errno_setter.Set(ErrorToErrno(error));
}
@@ -45,7 +45,7 @@
mojo::files::FilePtr new_file;
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
file_->Dup(mojo::GetProxy(&new_file), Capture(&error));
- if (!file_.WaitForIncomingMethodCall()) {
+ if (!file_.WaitForIncomingResponse()) {
errno_setter.Set(ESTALE);
return nullptr;
}
@@ -64,7 +64,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
file_->Truncate(static_cast<int64_t>(length), Capture(&error));
- if (!file_.WaitForIncomingMethodCall())
+ if (!file_.WaitForIncomingResponse())
return errno_setter.Set(ESTALE);
return errno_setter.Set(ErrorToErrno(error));
}
@@ -93,7 +93,7 @@
int64_t position = -1;
file_->Seek(static_cast<int64_t>(offset), mojo_whence,
Capture(&error, &position));
- if (!file_.WaitForIncomingMethodCall()) {
+ if (!file_.WaitForIncomingResponse()) {
errno_setter.Set(ESTALE);
return -1;
}
@@ -141,7 +141,7 @@
mojo::Array<uint8_t> bytes_read;
file_->Read(static_cast<uint32_t>(count), 0, mojo::files::WHENCE_FROM_CURRENT,
Capture(&error, &bytes_read));
- if (!file_.WaitForIncomingMethodCall()) {
+ if (!file_.WaitForIncomingResponse()) {
errno_setter.Set(ESTALE);
return -1;
}
@@ -188,7 +188,7 @@
uint32_t num_bytes_written = 0;
file_->Write(bytes_to_write.Pass(), 0, mojo::files::WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- if (!file_.WaitForIncomingMethodCall()) {
+ if (!file_.WaitForIncomingResponse()) {
errno_setter.Set(ESTALE);
return -1;
}
@@ -218,7 +218,7 @@
mojo::files::FileInformationPtr file_info;
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
file_->Stat(Capture(&error, &file_info));
- if (!file_.WaitForIncomingMethodCall()) {
+ if (!file_.WaitForIncomingResponse()) {
errno_setter.Set(ESTALE);
return false;
}
diff --git a/mojo/services/files/public/c/tests/mojio_impl_test_base.cc b/mojo/services/files/public/c/tests/mojio_impl_test_base.cc
index b55fd46..6b606a0 100644
--- a/mojo/services/files/public/c/tests/mojio_impl_test_base.cc
+++ b/mojo/services/files/public/c/tests/mojio_impl_test_base.cc
@@ -27,7 +27,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
files->OpenFileSystem(nullptr, mojo::GetProxy(&directory_), Capture(&error));
- MOJO_CHECK(files.WaitForIncomingMethodCall());
+ MOJO_CHECK(files.WaitForIncomingResponse());
MOJO_CHECK(error == mojo::files::ERROR_OK);
}
diff --git a/mojo/services/files/public/c/tests/test_utils.cc b/mojo/services/files/public/c/tests/test_utils.cc
index 5ef9e9a..1cf4ecf 100644
--- a/mojo/services/files/public/c/tests/test_utils.cc
+++ b/mojo/services/files/public/c/tests/test_utils.cc
@@ -22,7 +22,7 @@
mojo::files::kOpenFlagRead | mojo::files::kOpenFlagWrite |
mojo::files::kOpenFlagCreate,
Capture(&error));
- MOJO_CHECK(dir.WaitForIncomingMethodCall());
+ MOJO_CHECK(dir.WaitForIncomingResponse());
MOJO_CHECK(error == mojo::files::ERROR_OK);
}
@@ -36,7 +36,7 @@
mojo::files::FilePtr file;
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
dir->OpenFile(path, mojo::GetProxy(&file), open_flags, Capture(&error));
- MOJO_CHECK(dir.WaitForIncomingMethodCall());
+ MOJO_CHECK(dir.WaitForIncomingResponse());
if (error != mojo::files::ERROR_OK)
return nullptr;
@@ -62,7 +62,7 @@
file->Write(mojo::Array<uint8_t>::From(bytes_to_write), 0,
mojo::files::WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- MOJO_CHECK(file.WaitForIncomingMethodCall());
+ MOJO_CHECK(file.WaitForIncomingResponse());
MOJO_CHECK(error == mojo::files::ERROR_OK);
MOJO_CHECK(num_bytes_written == bytes_to_write.size());
}
@@ -77,7 +77,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
int64_t position = -1;
file->Seek(0, mojo::files::WHENCE_FROM_END, Capture(&error, &position));
- MOJO_CHECK(file.WaitForIncomingMethodCall());
+ MOJO_CHECK(file.WaitForIncomingResponse());
MOJO_CHECK(error == mojo::files::ERROR_OK);
MOJO_CHECK(position >= 0);
return position;
@@ -92,7 +92,7 @@
mojo::files::Error error = mojo::files::ERROR_INTERNAL;
file->Read(1024 * 1024, 0, mojo::files::WHENCE_FROM_START,
Capture(&error, &bytes_read));
- MOJO_CHECK(file.WaitForIncomingMethodCall());
+ MOJO_CHECK(file.WaitForIncomingResponse());
if (!bytes_read.size())
return std::string();
return std::string(reinterpret_cast<const char*>(&bytes_read[0]),
diff --git a/services/files/directory_impl_unittest.cc b/services/files/directory_impl_unittest.cc
index 1db55f1..c6bd3f4 100644
--- a/services/files/directory_impl_unittest.cc
+++ b/services/files/directory_impl_unittest.cc
@@ -31,7 +31,7 @@
error = ERROR_INTERNAL;
directory->OpenFile(files_to_create[i].name, nullptr,
files_to_create[i].open_flags, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
// Make a directory.
@@ -39,13 +39,13 @@
directory->OpenDirectory("my_dir", nullptr,
kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
error = ERROR_INTERNAL;
Array<DirectoryEntryPtr> directory_contents;
directory->Read(Capture(&error, &directory_contents));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Expected contents of the directory.
@@ -82,7 +82,7 @@
error = ERROR_INTERNAL;
FileInformationPtr file_info;
directory->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(FILE_TYPE_DIRECTORY, file_info->type);
@@ -101,14 +101,14 @@
const int64_t kPartyTime1 = 1234567890; // Party like it's 2009-02-13.
t->timespec->seconds = kPartyTime1;
directory->Touch(t.Pass(), nullptr, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat again.
error = ERROR_INTERNAL;
file_info.reset();
directory->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
@@ -123,14 +123,14 @@
const int64_t kPartyTime2 = 1425059525; // No time like the present.
t->timespec->seconds = kPartyTime2;
directory->Touch(nullptr, t.Pass(), Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat again.
error = ERROR_INTERNAL;
file_info.reset();
directory->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
@@ -153,41 +153,41 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", nullptr, kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Opening my_file should succeed.
error = ERROR_INTERNAL;
directory->OpenFile("my_file", nullptr, kOpenFlagRead, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Rename my_file to my_new_file.
directory->Rename("my_file", "my_new_file", Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Opening my_file should fail.
error = ERROR_INTERNAL;
directory->OpenFile("my_file", nullptr, kOpenFlagRead, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_UNKNOWN, error);
// Opening my_new_file should succeed.
error = ERROR_INTERNAL;
directory->OpenFile("my_new_file", nullptr, kOpenFlagRead, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Delete my_new_file (no flags).
directory->Delete("my_new_file", 0, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Opening my_new_file should fail.
error = ERROR_INTERNAL;
directory->OpenFile("my_new_file", nullptr, kOpenFlagRead, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_UNKNOWN, error);
}
diff --git a/services/files/file_impl_unittest.cc b/services/files/file_impl_unittest.cc
index 43b4ddb..d806e36 100644
--- a/services/files/file_impl_unittest.cc
+++ b/services/files/file_impl_unittest.cc
@@ -25,7 +25,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -39,21 +39,21 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
// Rename it.
error = ERROR_INTERNAL;
directory->Rename("my_file", "your_file", Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
{
@@ -62,14 +62,14 @@
error = ERROR_INTERNAL;
directory->OpenFile("your_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Read from it.
Array<uint8_t> bytes_read;
error = ERROR_INTERNAL;
file->Read(3, 1, WHENCE_FROM_START, Capture(&error, &bytes_read));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_EQ(3u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('e'), bytes_read[0]);
@@ -98,7 +98,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -106,14 +106,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -123,7 +123,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Try to write in read mode; it should fail.
@@ -131,14 +131,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_UNKNOWN, error);
EXPECT_EQ(0u, num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
}
@@ -155,13 +155,13 @@
directory->OpenFile("temp_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate |kOpenFlagExclusive,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -172,7 +172,7 @@
directory->OpenFile("temp_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate | kOpenFlagExclusive,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_UNKNOWN, error);
}
}
@@ -188,7 +188,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -202,14 +202,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -219,7 +219,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagAppend, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -235,14 +235,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -252,14 +252,14 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Read from it.
Array<uint8_t> bytes_read;
error = ERROR_INTERNAL;
file->Read(12, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_EQ(12u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('l'), bytes_read[3]);
@@ -280,7 +280,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -294,14 +294,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -311,7 +311,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagTruncate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -327,14 +327,14 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
error = ERROR_INTERNAL;
file->Close(Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
}
@@ -344,14 +344,14 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Read from it.
Array<uint8_t> bytes_read;
error = ERROR_INTERNAL;
file->Read(7, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_EQ(7u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('g'), bytes_read[0]);
@@ -373,14 +373,14 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat it.
error = ERROR_INTERNAL;
FileInformationPtr file_info;
file->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(FILE_TYPE_REGULAR_FILE, file_info->type);
@@ -399,14 +399,14 @@
const int64_t kPartyTime1 = 1234567890; // Party like it's 2009-02-13.
t->timespec->seconds = kPartyTime1;
file->Touch(t.Pass(), nullptr, Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat again.
error = ERROR_INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
@@ -421,14 +421,14 @@
const int64_t kPartyTime2 = 1425059525; // No time like the present.
t->timespec->seconds = kPartyTime2;
file->Touch(nullptr, t.Pass(), Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat again.
error = ERROR_INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
@@ -451,7 +451,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -460,7 +460,7 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
const int size = static_cast<int>(num_bytes_written);
@@ -469,7 +469,7 @@
error = ERROR_INTERNAL;
int64_t position = -1;
file->Tell(Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
// Should be at the end.
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(size, position);
@@ -478,7 +478,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Seek(-100, WHENCE_FROM_CURRENT, Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(size - 100, position);
@@ -486,7 +486,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(size - 100, position);
@@ -494,7 +494,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Seek(123, WHENCE_FROM_START, Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(123, position);
@@ -502,7 +502,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(123, position);
@@ -510,7 +510,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Seek(-123, WHENCE_FROM_END, Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(size - 123, position);
@@ -518,7 +518,7 @@
error = ERROR_INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(size - 123, position);
@@ -537,7 +537,7 @@
directory->OpenFile("my_file", GetProxy(&file1),
kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -551,7 +551,7 @@
uint32_t num_bytes_written = 0;
file1->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file1.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file1.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
const int end_hello_pos = static_cast<int>(num_bytes_written);
@@ -560,14 +560,14 @@
FilePtr file2;
error = ERROR_INTERNAL;
file1->Dup(GetProxy(&file2), Capture(&error));
- ASSERT_TRUE(file1.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file1.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// |file2| should have the same position.
error = ERROR_INTERNAL;
int64_t position = -1;
file2->Tell(Capture(&error, &position));
- ASSERT_TRUE(file2.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file2.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(end_hello_pos, position);
@@ -582,7 +582,7 @@
num_bytes_written = 0;
file2->Write(Array<uint8_t>::From(more_bytes_to_write), 0,
WHENCE_FROM_CURRENT, Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file2.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file2.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(more_bytes_to_write.size(), num_bytes_written);
const int end_world_pos = end_hello_pos + static_cast<int>(num_bytes_written);
@@ -591,21 +591,21 @@
error = ERROR_INTERNAL;
position = -1;
file1->Tell(Capture(&error, &position));
- ASSERT_TRUE(file1.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file1.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(end_world_pos, position);
// Close |file1|.
error = ERROR_INTERNAL;
file1->Close(Capture(&error));
- ASSERT_TRUE(file1.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file1.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Read everything using |file2|.
Array<uint8_t> bytes_read;
error = ERROR_INTERNAL;
file2->Read(1000, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
- ASSERT_TRUE(file2.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file2.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_EQ(static_cast<size_t>(end_world_pos), bytes_read.size());
// Just check the first and last bytes.
@@ -628,7 +628,7 @@
error = ERROR_INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Write to it.
@@ -637,7 +637,7 @@
uint32_t num_bytes_written = 0;
file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
Capture(&error, &num_bytes_written));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
EXPECT_EQ(kInitialSize, num_bytes_written);
@@ -645,7 +645,7 @@
error = ERROR_INTERNAL;
FileInformationPtr file_info;
file->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(kInitialSize, file_info->size);
@@ -653,14 +653,14 @@
// Truncate it.
error = ERROR_INTERNAL;
file->Truncate(kTruncatedSize, Capture(&error));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Stat again.
error = ERROR_INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(kTruncatedSize, file_info->size);
@@ -677,13 +677,13 @@
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
- ASSERT_TRUE(directory.WaitForIncomingMethodCall());
+ ASSERT_TRUE(directory.WaitForIncomingResponse());
EXPECT_EQ(ERROR_OK, error);
// Normal files don't support any ioctls.
Array<uint32_t> out_values;
file->Ioctl(0, Array<uint32_t>(), Capture(&error, &out_values));
- ASSERT_TRUE(file.WaitForIncomingMethodCall());
+ ASSERT_TRUE(file.WaitForIncomingResponse());
EXPECT_EQ(ERROR_UNAVAILABLE, error);
EXPECT_TRUE(out_values.is_null());
}
diff --git a/services/files/files_test_base.cc b/services/files/files_test_base.cc
index 6ddef93..6dd8937 100644
--- a/services/files/files_test_base.cc
+++ b/services/files/files_test_base.cc
@@ -25,7 +25,7 @@
void FilesTestBase::GetTemporaryRoot(DirectoryPtr* directory) {
Error error = ERROR_INTERNAL;
files()->OpenFileSystem(nullptr, GetProxy(directory), Capture(&error));
- ASSERT_TRUE(files().WaitForIncomingMethodCall());
+ ASSERT_TRUE(files().WaitForIncomingResponse());
ASSERT_EQ(ERROR_OK, error);
}
diff --git a/services/http_server/http_server_apptest.cc b/services/http_server/http_server_apptest.cc
index 27f4219..9827d42 100644
--- a/services/http_server/http_server_apptest.cc
+++ b/services/http_server/http_server_apptest.cc
@@ -50,10 +50,6 @@
: binding_(this, request.Pass()) {}
~GetHandler() override {}
- bool WaitForIncomingMethodCall() {
- return binding_.WaitForIncomingMethodCall();
- }
-
private:
// http_server::HttpHandler:
void HandleRequest(http_server::HttpRequestPtr request,
@@ -75,10 +71,6 @@
: binding_(this, request.Pass()) {}
~PostHandler() override {}
- bool WaitForIncomingMethodCall() {
- return binding_.WaitForIncomingMethodCall();
- }
-
private:
// http_server::HttpHandler:
void HandleRequest(http_server::HttpRequestPtr request,
@@ -150,7 +142,7 @@
http_server::HttpServerPtr http_server(CreateHttpServer());
uint16_t assigned_port;
http_server->GetPort([&assigned_port](uint16_t p) { assigned_port = p; });
- http_server.WaitForIncomingMethodCall();
+ http_server.WaitForIncomingResponse();
HttpHandlerPtr http_handler_ptr;
GetHandler handler(GetProxy(&http_handler_ptr).Pass());
@@ -158,7 +150,7 @@
// Set the test handler and wait for confirmation.
http_server->SetHandler("/test", http_handler_ptr.Pass(),
[](bool result) { EXPECT_TRUE(result); });
- http_server.WaitForIncomingMethodCall();
+ http_server.WaitForIncomingResponse();
mojo::URLLoaderPtr url_loader;
network_service_->CreateURLLoader(GetProxy(&url_loader));
@@ -177,7 +169,7 @@
http_server::HttpServerPtr http_server(CreateHttpServer());
uint16_t assigned_port;
http_server->GetPort([&assigned_port](uint16_t p) { assigned_port = p; });
- http_server.WaitForIncomingMethodCall();
+ http_server.WaitForIncomingResponse();
HttpHandlerPtr http_handler_ptr;
PostHandler handler(GetProxy(&http_handler_ptr).Pass());
@@ -185,7 +177,7 @@
// Set the test handler and wait for confirmation.
http_server->SetHandler("/post", http_handler_ptr.Pass(),
[](bool result) { EXPECT_TRUE(result); });
- http_server.WaitForIncomingMethodCall();
+ http_server.WaitForIncomingResponse();
mojo::URLLoaderPtr url_loader;
network_service_->CreateURLLoader(GetProxy(&url_loader));
diff --git a/services/js/echo_apptest.cc b/services/js/echo_apptest.cc
index 220aaa3..daf59d3 100644
--- a/services/js/echo_apptest.cc
+++ b/services/js/echo_apptest.cc
@@ -69,7 +69,7 @@
String foo;
EchoStringCallback callback(&foo);
echo_service_->EchoString("foo", callback);
- EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(echo_service_.WaitForIncomingResponse());
EXPECT_EQ("foo", foo);
echo_service_->Quit();
}
@@ -78,7 +78,7 @@
String empty;
EchoStringCallback callback(&empty);
echo_service_->EchoString("", callback);
- EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(echo_service_.WaitForIncomingResponse());
EXPECT_EQ("", empty);
echo_service_->Quit();
}
@@ -87,7 +87,7 @@
String null;
EchoStringCallback callback(&null);
echo_service_->EchoString(nullptr, callback);
- EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(echo_service_.WaitForIncomingResponse());
EXPECT_TRUE(null.is_null());
echo_service_->Quit();
}
@@ -98,7 +98,7 @@
bool returned_value;
ShareEchoServiceCallback callback(&returned_value);
echo_service_->ShareEchoService(callback);
- EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(echo_service_.WaitForIncomingResponse());
EXPECT_TRUE(returned_value);
echo_service_->Quit();
}
@@ -115,7 +115,7 @@
String foo;
EchoStringCallback callback(&foo);
echo_service->EchoString("foo", callback);
- EXPECT_TRUE(echo_service.WaitForIncomingMethodCall());
+ EXPECT_TRUE(echo_service.WaitForIncomingResponse());
EXPECT_EQ("foo", foo);
echo_service->Quit();
}
diff --git a/services/js/network_apptest.cc b/services/js/network_apptest.cc
index 191d821..94381a5 100644
--- a/services/js/network_apptest.cc
+++ b/services/js/network_apptest.cc
@@ -51,7 +51,7 @@
uint64 file_size;
GetFileSizeCallback callback(&file_size_ok, &file_size);
network_test_service_->GetFileSize(JSAppURL(filename), callback);
- EXPECT_TRUE(network_test_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(network_test_service_.WaitForIncomingResponse());
EXPECT_TRUE(file_size_ok);
EXPECT_EQ(file_size, static_cast<uint64>(expected_file_size));
network_test_service_->Quit();
diff --git a/services/js/pingpong_apptest.cc b/services/js/pingpong_apptest.cc
index e78415a..e5e4ad3 100644
--- a/services/js/pingpong_apptest.cc
+++ b/services/js/pingpong_apptest.cc
@@ -83,7 +83,7 @@
bool returned_value = false;
PingTargetCallback callback(&returned_value);
pingpong_service_->PingTargetURL(JSAppURL("pingpong_target.js"), 9, callback);
- EXPECT_TRUE(pingpong_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(pingpong_service_.WaitForIncomingResponse());
EXPECT_TRUE(returned_value);
pingpong_service_->Quit();
}
@@ -96,7 +96,7 @@
bool returned_value = false;
PingTargetCallback callback(&returned_value);
pingpong_service_->PingTargetService(target.Pass(), 9, callback);
- EXPECT_TRUE(pingpong_service_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(pingpong_service_.WaitForIncomingResponse());
EXPECT_TRUE(returned_value);
pingpong_service_->Quit();
}
diff --git a/services/nacl/content_handler_main.cc b/services/nacl/content_handler_main.cc
index 2b960c2..4d1a4fa 100644
--- a/services/nacl/content_handler_main.cc
+++ b/services/nacl/content_handler_main.cc
@@ -52,7 +52,7 @@
url_loader->Start(request.Pass(), [&response](mojo::URLResponsePtr r) {
response = r.Pass();
});
- url_loader.WaitForIncomingMethodCall();
+ url_loader.WaitForIncomingResponse();
if (response.is_null()) {
LOG(FATAL) << "something went horribly wrong (missed a callback?)";
}
diff --git a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
index 96af401..f7ae0bf 100644
--- a/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
+++ b/services/python/mojo_url_redirector/mojo_url_redirector_apptest.cc
@@ -119,7 +119,7 @@
location_files_handler.Pass(),
base::Bind(&MojoUrlRedirectorApplicationTest::OnAddedHandler,
base::Unretained(this)));
- location_files_server_.WaitForIncomingMethodCall();
+ location_files_server_.WaitForIncomingResponse();
// Connect to the redirector and wait until it registers itself as a
// handler with the server on |redirector_port_|.
@@ -196,7 +196,7 @@
base::Bind(
&MojoUrlRedirectorApplicationTest::CheckRedirectorRegistered,
base::Unretained(this)));
- ASSERT_TRUE(url_loader.WaitForIncomingMethodCall());
+ ASSERT_TRUE(url_loader.WaitForIncomingResponse());
}
}
diff --git a/services/url_response_disk_cache/url_response_disk_cache_apptest.cc b/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
index 6b543de..c2788c2 100644
--- a/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
+++ b/services/url_response_disk_cache/url_response_disk_cache_apptest.cc
@@ -67,7 +67,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
std::string received_content;
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
@@ -97,7 +97,7 @@
extracted_dir = toPath(received_extracted_dir.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(extracted_dir.empty());
base::FilePath file1 = extracted_dir.Append("file1");
std::string file_content;
@@ -132,7 +132,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
std::string received_content;
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
@@ -165,7 +165,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
EXPECT_EQ(content, received_content);
@@ -197,7 +197,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
EXPECT_EQ(new_content, received_content);
@@ -226,7 +226,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
EXPECT_EQ(new_content, received_content);
@@ -256,7 +256,7 @@
file = toPath(received_file_path.Pass());
cache_dir = toPath(received_cache_dir_path.Pass());
});
- url_response_disk_cache_.WaitForIncomingMethodCall();
+ url_response_disk_cache_.WaitForIncomingResponse();
ASSERT_FALSE(file.empty());
ASSERT_TRUE(base::ReadFileToString(file, &received_content));
EXPECT_EQ(new_content, received_content);
diff --git a/shell/shell_apptest.cc b/shell/shell_apptest.cc
index 468e00c..4720d0e 100644
--- a/shell/shell_apptest.cc
+++ b/shell/shell_apptest.cc
@@ -92,13 +92,13 @@
local_address.Pass());
http_server_->GetPort([this](uint16_t p) { port_ = p; });
- EXPECT_TRUE(http_server_.WaitForIncomingMethodCall());
+ EXPECT_TRUE(http_server_.WaitForIncomingResponse());
http_server::HttpHandlerPtr http_handler;
handler_.reset(new GetHandler(mojo::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) { return ::GetURL(port_, path); }
