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

Unified Diff: mojo/edk/system/platform_handle_dispatcher_unittest.cc

Issue 1748503002: [mojo-edk] Add MojoWatch and MojoCancelWatch APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 10 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: mojo/edk/system/platform_handle_dispatcher_unittest.cc
diff --git a/mojo/edk/system/platform_handle_dispatcher_unittest.cc b/mojo/edk/system/platform_handle_dispatcher_unittest.cc
index ad6dc381659767ff418fd6971c7e577a6d5ffff4..95adf11058122817393d07cad4e98a62cbb95a4d 100644
--- a/mojo/edk/system/platform_handle_dispatcher_unittest.cc
+++ b/mojo/edk/system/platform_handle_dispatcher_unittest.cc
@@ -59,7 +59,8 @@ TEST(PlatformHandleDispatcherTest, Basic) {
h = dispatcher->PassPlatformHandle();
EXPECT_FALSE(h.is_valid());
- EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
+ Dispatcher::RequestContext request_context;
+ EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close(&request_context));
}
TEST(PlatformHandleDispatcherTest, Serialization) {
@@ -77,10 +78,11 @@ TEST(PlatformHandleDispatcherTest, Serialization) {
PlatformHandleDispatcher::Create(
test::PlatformHandleFromFILE(std::move(fp)));
+ Dispatcher::RequestContext request_context;
uint32_t num_bytes = 0;
uint32_t num_ports = 0;
uint32_t num_handles = 0;
- EXPECT_TRUE(dispatcher->BeginTransit());
+ EXPECT_TRUE(dispatcher->BeginTransit(&request_context));
dispatcher->StartSerialize(&num_bytes, &num_ports, &num_handles);
EXPECT_EQ(0u, num_bytes);
@@ -89,14 +91,14 @@ TEST(PlatformHandleDispatcherTest, Serialization) {
ScopedPlatformHandleVectorPtr handles(new PlatformHandleVector(1));
EXPECT_TRUE(dispatcher->EndSerialize(nullptr, nullptr, handles->data()));
- dispatcher->CompleteTransitAndClose();
+ dispatcher->CompleteTransitAndClose(&request_context);
EXPECT_TRUE(handles->at(0).is_valid());
ScopedPlatformHandle handle = dispatcher->PassPlatformHandle();
EXPECT_FALSE(handle.is_valid());
- EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, dispatcher->Close());
+ EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, dispatcher->Close(&request_context));
dispatcher = static_cast<PlatformHandleDispatcher*>(
Dispatcher::Deserialize(Dispatcher::Type::PLATFORM_HANDLE, nullptr,
@@ -115,7 +117,7 @@ TEST(PlatformHandleDispatcherTest, Serialization) {
fread(read_buffer, 1, sizeof(read_buffer), fp.get()));
EXPECT_STREQ(kFooBar, read_buffer);
- EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
+ EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close(&request_context));
}
} // namespace

Powered by Google App Engine
This is Rietveld 408576698