[mojo-edk] Expose notification source to MojoWatch callbacks

mojo/edk/system/watch_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <functional>
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "mojo/edk/test/mojo_test_base.h"
 #include "mojo/public/c/system/functions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace edk {
 namespace {
 
 void IgnoreResult(uintptr_t context,
                   MojoResult result,
-                  MojoHandleSignalsState signals) {
+                  MojoHandleSignalsState signals,
+                  MojoWatchNotificationFlags flags) {
 }
 
 // A test helper class for watching a handle. The WatchHelper instance is used
 // as a watch context for a single watch callback.
 class WatchHelper {
  public:
   using Callback =
       std::function<void(MojoResult result, MojoHandleSignalsState state)>;
 
   WatchHelper() {}
@@ skipping 18 matching lines @@
   void Cancel() {
     CHECK_EQ(MOJO_RESULT_OK,
              MojoCancelWatch(handle_, reinterpret_cast<uintptr_t>(this)));
     CHECK(watching_);
     watching_ = false;
   }
 
  private:
   static void OnNotify(uintptr_t context,
                        MojoResult result,
-                       MojoHandleSignalsState state) {
+                       MojoHandleSignalsState state,
+                       MojoWatchNotificationFlags flags) {
     WatchHelper* watcher = reinterpret_cast<WatchHelper*>(context);
     CHECK(watcher->watching_);
     if (result == MOJO_RESULT_CANCELLED)
       watcher->watching_ = false;
+    CHECK_EQ(flags, MOJO_WATCH_NOTIFICATION_FLAG_NONE);
     watcher->callback_(result, state);
   }
 
   bool watching_ = false;
   MojoHandle handle_;
   Callback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(WatchHelper);
 };
 
@@ skipping 323 matching lines @@
 
   b_watcher.Cancel();
 
   CloseHandle(a);
   CloseHandle(b);
 }
 
 }  // namespace
 }  // namespace edk
 }  // namespace mojo