[mojo-edk] Add MojoWatch and MojoCancelWatch APIs

mojo/edk/system/shared_buffer_dispatcher_unittest.cc

Index: mojo/edk/system/shared_buffer_dispatcher_unittest.cc
diff --git a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
index 40564886eb2b0600ff1ac723c76274c10e9ee1d1..b2ca0f770fe3ab74e7f10b2529bfb11cccaacf3d 100644
--- a/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
+++ b/mojo/edk/system/shared_buffer_dispatcher_unittest.cc
@@ -136,7 +136,8 @@ TEST_F(SharedBufferDispatcherTest, CreateAndMapBuffer) {
   EXPECT_EQ(50u, mapping2->GetLength());
   EXPECT_EQ('x', static_cast<char*>(mapping2->GetBase())[0]);
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
+  Dispatcher::RequestContext request_context;
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close(&request_context));
 
   // Check that we can still read/write to mappings after the dispatcher has
   // gone away.
@@ -173,7 +174,8 @@ TEST_F(SharedBufferDispatcherTest, CreateAndMapBufferFromPlatformBuffer) {
   EXPECT_EQ(50u, mapping2->GetLength());
   EXPECT_EQ('x', static_cast<char*>(mapping2->GetBase())[0]);
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
+  Dispatcher::RequestContext request_context;
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close(&request_context));
 
   // Check that we can still read/write to mappings after the dispatcher has
   // gone away.
@@ -201,14 +203,15 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandle) {
   ASSERT_TRUE(dispatcher2);
   EXPECT_EQ(Dispatcher::Type::SHARED_BUFFER, dispatcher2->GetType());
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
+  Dispatcher::RequestContext request_context;
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close(&request_context));
 
   // Map |dispatcher2| and read something.
   EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->MapBuffer(
                                 0, 100, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_EQ('x', static_cast<char*>(mapping->GetBase())[0]);
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close(&request_context));
 }
 
 TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsValid) {
@@ -217,6 +220,7 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsValid) {
                                 SharedBufferDispatcher::kDefaultCreateOptions,
                                 100, &dispatcher1));
 
+  Dispatcher::RequestContext request_context;
   MojoDuplicateBufferHandleOptions options[] = {
       {sizeof(MojoDuplicateBufferHandleOptions),
        MOJO_DUPLICATE_BUFFER_HANDLE_OPTIONS_FLAG_NONE},
@@ -227,10 +231,10 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsValid) {
                                   &options[i], &dispatcher2));
     ASSERT_TRUE(dispatcher2);
     EXPECT_EQ(Dispatcher::Type::SHARED_BUFFER, dispatcher2->GetType());
-    EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close());
+    EXPECT_EQ(MOJO_RESULT_OK, dispatcher2->Close(&request_context));
   }
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close(&request_context));
 }
 
 TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsInvalid) {
@@ -259,7 +263,8 @@ TEST_F(SharedBufferDispatcherTest, DuplicateBufferHandleOptionsInvalid) {
     EXPECT_FALSE(dispatcher2);
   }
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close());
+  Dispatcher::RequestContext request_context;
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher1->Close(&request_context));
 }
 
 TEST_F(SharedBufferDispatcherTest, CreateInvalidNumBytes) {
@@ -297,7 +302,8 @@ TEST_F(SharedBufferDispatcherTest, MapBufferInvalidArguments) {
             dispatcher->MapBuffer(0, 0, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
 
-  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close());
+  Dispatcher::RequestContext request_context;
+  EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close(&request_context));
 }
 
 }  // namespace