Revert of Mojo: Armed Watchers

mojo/edk/system/multiprocess_message_pipe_unittest.cc

Index: mojo/edk/system/multiprocess_message_pipe_unittest.cc
diff --git a/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/mojo/edk/system/multiprocess_message_pipe_unittest.cc
index f8e29d633922aba9b730047a6750f21fd13d15c8..498980c9d0e99db6fca826a10c11e6a63077a76c 100644
--- a/mojo/edk/system/multiprocess_message_pipe_unittest.cc
+++ b/mojo/edk/system/multiprocess_message_pipe_unittest.cc
@@ -31,7 +31,7 @@
 #include "mojo/public/c/system/buffer.h"
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/types.h"
-#include "mojo/public/cpp/system/simple_watcher.h"
+#include "mojo/public/cpp/system/watcher.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
@@ -1271,17 +1271,15 @@
 
   base::MessageLoop message_loop;
 
-  // Wait on handle 1 using a SimpleWatcher.
+  // Wait on handle 1 using a Watcher.
   {
     base::RunLoop run_loop;
-    SimpleWatcher watcher(FROM_HERE, SimpleWatcher::ArmingPolicy::AUTOMATIC);
-    watcher.Watch(Handle(handles[1]), MOJO_HANDLE_SIGNAL_PEER_CLOSED,
-                  base::Bind(
-                      [](base::RunLoop* loop, MojoResult result) {
-                        EXPECT_EQ(MOJO_RESULT_OK, result);
-                        loop->Quit();
-                      },
-                      &run_loop));
+    Watcher watcher(FROM_HERE);
+    watcher.Start(Handle(handles[1]), MOJO_HANDLE_SIGNAL_PEER_CLOSED,
+                  base::Bind([] (base::RunLoop* loop, MojoResult result) {
+                    EXPECT_EQ(MOJO_RESULT_OK, result);
+                    loop->Quit();
+                  }, &run_loop));
     run_loop.Run();
   }