Revert of Mojo: Armed Watchers

mojo/edk/system/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/nacl/config.gni")
 import("//testing/test.gni")
 import("../../../mojo/public/tools/bindings/mojom.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
@@ skipping 48 matching lines @@
     "ports_message.cc",
     "ports_message.h",
     "request_context.cc",
     "request_context.h",
     "shared_buffer_dispatcher.cc",
     "shared_buffer_dispatcher.h",
     "wait_set_dispatcher.cc",
     "wait_set_dispatcher.h",
     "waiter.cc",
     "waiter.h",
-    "watch.cc",
-    "watch.h",
-    "watcher_dispatcher.cc",
-    "watcher_dispatcher.h",
+    "watcher.cc",
+    "watcher.h",
     "watcher_set.cc",
     "watcher_set.h",
   ]
 
   defines = [ "MOJO_SYSTEM_IMPL_IMPLEMENTATION" ]
 
   public_deps = [
     "//mojo/edk/embedder",
     "//mojo/edk/embedder:platform",
     "//mojo/edk/system/ports",
@@ skipping 79 matching lines @@
     "core_unittest.cc",
     "message_pipe_unittest.cc",
     "options_validation_unittest.cc",
     "platform_handle_dispatcher_unittest.cc",
     "shared_buffer_dispatcher_unittest.cc",
     "shared_buffer_unittest.cc",
     "wait_set_dispatcher_unittest.cc",
     "waiter_test_utils.cc",
     "waiter_test_utils.h",
     "waiter_unittest.cc",
-    "watcher_unittest.cc",
+    "watch_unittest.cc",
   ]
 
   if (!is_ios) {
     sources += [
       "data_pipe_unittest.cc",
       "multiprocess_message_pipe_unittest.cc",
       "platform_wrapper_unittest.cc",
     ]
   }
 
@@ skipping 23 matching lines @@
       ":test_utils",
       "//base",
       "//base/test:test_support",
       "//mojo/edk/system",
       "//mojo/edk/test:run_all_perftests",
       "//mojo/edk/test:test_support",
       "//testing/gtest",
     ]
   }
 }