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

mojo/edk/system/channel_manager_unittest.cc

 // 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.
 
 #include "mojo/edk/system/channel_manager.h"
 
 #include <functional>
 #include <memory>
 #include <utility>
 
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/edk/platform/message_loop.h"
-#include "mojo/edk/platform/message_loop_for_io.h"
 #include "mojo/edk/platform/task_runner.h"
 #include "mojo/edk/platform/test_message_loops.h"
 #include "mojo/edk/system/channel.h"
 #include "mojo/edk/system/channel_endpoint.h"
 #include "mojo/edk/system/message_pipe_dispatcher.h"
 #include "mojo/edk/system/test/simple_test_thread.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using mojo::platform::MessageLoop;
-using mojo::platform::MessageLoopForIO;
+using mojo::platform::PlatformHandleWatcher;
 using mojo::platform::TaskRunner;
 using mojo::platform::test::CreateTestMessageLoop;
 using mojo::platform::test::CreateTestMessageLoopForIO;
 using mojo::util::RefPtr;
 
 namespace mojo {
 namespace system {
 namespace {
 
 class ChannelManagerTest : public testing::Test {
  public:
   ChannelManagerTest()
-      : message_loop_(CreateTestMessageLoopForIO()),
+      : platform_handle_watcher_(nullptr),
+        message_loop_(CreateTestMessageLoopForIO(&platform_handle_watcher_)),
         channel_manager_(&platform_support_,
                          message_loop_->GetTaskRunner().Clone(),
                          nullptr) {}
   ~ChannelManagerTest() override {}
 
  protected:
   MessageLoop* message_loop() { return message_loop_.get(); }
   const RefPtr<TaskRunner>& task_runner() {
     return message_loop_->GetTaskRunner();
   }
   ChannelManager& channel_manager() { return channel_manager_; }
 
  private:
   embedder::SimplePlatformSupport platform_support_;
-  std::unique_ptr<MessageLoopForIO> message_loop_;
+  // TODO(vtl): The |PlatformHandleWatcher| and |MessageLoop| should be injected
+  // into the |ChannelManager|.
+  // Valid while |message_loop_| is valid.
+  PlatformHandleWatcher* platform_handle_watcher_;
+  std::unique_ptr<MessageLoop> message_loop_;
   // Note: This should be *after* the above, since they must be initialized
   // before it (and should outlive it).
   ChannelManager channel_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ChannelManagerTest);
 };
 
 TEST_F(ChannelManagerTest, Basic) {
   embedder::PlatformChannelPair channel_pair;
 
@@ skipping 111 matching lines @@
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 }
 
 // TODO(vtl): Test |CreateChannelWithoutBootstrapOnIOThread()|. (This will
 // require additional functionality in |Channel|.)
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo