EDK: Remove mojo::platform::MessageLoopForIO and add PlatformHandleWatcher.

mojo/edk/base_edk/test_message_loops_unittest.cc

Index: mojo/edk/base_edk/test_message_loops_unittest.cc
diff --git a/mojo/edk/base_edk/test_message_loops_unittest.cc b/mojo/edk/base_edk/test_message_loops_unittest.cc
index 24cecc24fa2f0d7f43eab84bfcb113a7dfe7dc7b..78c7424ba1e558ae807864de7a4db26a7502c734 100644
--- a/mojo/edk/base_edk/test_message_loops_unittest.cc
+++ b/mojo/edk/base_edk/test_message_loops_unittest.cc
@@ -10,12 +10,11 @@
 
 #include "mojo/edk/base_edk/message_loop_test_helper.h"
 #include "mojo/edk/platform/message_loop.h"
-#include "mojo/edk/platform/message_loop_for_io.h"
 #include "mojo/edk/platform/test_message_loops.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::platform::MessageLoop;
-using mojo::platform::MessageLoopForIO;
+using mojo::platform::PlatformHandleWatcher;
 
 namespace {
 
@@ -26,9 +25,13 @@ TEST(TestMessageLoopsTest, CreateTestMessageLoop) {
 }
 
 TEST(TestMessageLoopsTest, CreateTestMessageLoopForIO) {
-  std::unique_ptr<MessageLoopForIO> message_loop_for_io =
-      mojo::platform::test::CreateTestMessageLoopForIO();
-  base_edk::test::MessageLoopTestHelper(message_loop_for_io.get());
+  PlatformHandleWatcher* platform_handle_watcher = nullptr;
+  std::unique_ptr<MessageLoop> message_loop =
+      mojo::platform::test::CreateTestMessageLoopForIO(
+          &platform_handle_watcher);
+  base_edk::test::MessageLoopTestHelper(message_loop.get());
+  EXPECT_TRUE(platform_handle_watcher);
+  // TODO(vtl): Also test the watcher.

[vardhan, 2015/12/09 00:18:27]

:P

 }
 
 }  // namespace