Add //mojo/edk/platform and move platform_task_runners.h there.

mojo/edk/system/ipc_support.h

 // Copyright 2015 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.
 
 #ifndef MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
 #define MOJO_EDK_SYSTEM_IPC_SUPPORT_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
-#include "mojo/edk/embedder/platform_task_runner.h"
 #include "mojo/edk/embedder/process_type.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/embedder/slave_info.h"
+#include "mojo/edk/platform/task_runner.h"
 #include "mojo/edk/system/channel_id.h"
 #include "mojo/edk/system/connection_identifier.h"
 #include "mojo/edk/system/process_identifier.h"
 #include "mojo/edk/util/ref_ptr.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace mojo {
 
 namespace embedder {
 class PlatformSupport;
@@ skipping 29 matching lines @@
 // be called during/after |ShutdownOnIOThread()|.)
 class IPCSupport {
  public:
   // Constructor: initializes for the given |process_type|; |process_delegate|
   // must match the process type. |platform_handle| is only used for slave
   // processes.
   //
   // All the (pointer) arguments must remain alive (and, in the case of task
   // runners, continue to process tasks) until |ShutdownOnIOThread()| has been
   // called.
-  IPCSupport(
-      embedder::PlatformSupport* platform_support,
-      embedder::ProcessType process_type,
-      util::RefPtr<embedder::PlatformTaskRunner>&& delegate_thread_task_runner,
-      embedder::ProcessDelegate* process_delegate,
-      util::RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner,
-      embedder::ScopedPlatformHandle platform_handle);
+  IPCSupport(embedder::PlatformSupport* platform_support,
+             embedder::ProcessType process_type,
+             util::RefPtr<platform::TaskRunner>&& delegate_thread_task_runner,
+             embedder::ProcessDelegate* process_delegate,
+             util::RefPtr<platform::TaskRunner>&& io_thread_task_runner,
+             embedder::ScopedPlatformHandle platform_handle);
   // Note: This object must be shut down before destruction (see
   // |ShutdownOnIOThread()|).
   ~IPCSupport();
 
   // This must be called (exactly once) on the I/O thread before this object is
   // destroyed (which may happen on any thread). Note: This does *not* call the
   // process delegate's |OnShutdownComplete()|.
   void ShutdownOnIOThread();
 
   // Generates a new (unique) connection identifier, for use with
@@ skipping 16 matching lines @@
   // channel may be destroyed using this ID, but only after the callback has
   // been run.
   //
   // TODO(vtl): Add some more channel management functionality to this class.
   // Maybe make this callback interface more sane.
   util::RefPtr<MessagePipeDispatcher> ConnectToSlave(
       const ConnectionIdentifier& connection_id,
       embedder::SlaveInfo slave_info,
       embedder::ScopedPlatformHandle platform_handle,
       const base::Closure& callback,
-      util::RefPtr<embedder::PlatformTaskRunner>&& callback_thread_task_runner,
+      util::RefPtr<platform::TaskRunner>&& callback_thread_task_runner,
       ChannelId* channel_id);
 
   // Called in a slave process to connect it to the master process and thus the
   // IPC system, creating a |Channel| and an initial message pipe (return a
   // dispatcher for the slave's side). See |ConnectToSlave()|, above.
   //
   // |callback|, |callback_thread_task_runner|, and |channel_id| are as in
   // |ConnectToSlave()|.
   //
   // TODO(vtl): |ConnectToSlave()|'s channel management TODO also applies here.
   util::RefPtr<MessagePipeDispatcher> ConnectToMaster(
       const ConnectionIdentifier& connection_id,
       const base::Closure& callback,
-      util::RefPtr<embedder::PlatformTaskRunner>&& callback_thread_task_runner,
+      util::RefPtr<platform::TaskRunner>&& callback_thread_task_runner,
       ChannelId* channel_id);
 
   embedder::ProcessType process_type() const { return process_type_; }
   embedder::ProcessDelegate* process_delegate() const {
     return process_delegate_;
   }
-  embedder::PlatformTaskRunner* delegate_thread_task_runner() const {
-    return delegate_thread_task_runner_.get();
+  const util::RefPtr<platform::TaskRunner>& delegate_thread_task_runner()

[kulakowski, 2015/11/23 19:11:21]

Nice.

+      const {
+    return delegate_thread_task_runner_;
   }
-  embedder::PlatformTaskRunner* io_thread_task_runner() const {
-    return io_thread_task_runner_.get();
+  const util::RefPtr<platform::TaskRunner>& io_thread_task_runner() const {
+    return io_thread_task_runner_;
   }
   // TODO(vtl): The things that use the following should probably be moved into
   // this class.
   ChannelManager* channel_manager() const { return channel_manager_.get(); }
 
  private:
   // These test |ConnectToSlaveInternal()| and |ConnectToMasterInternal()|.
   FRIEND_TEST_ALL_PREFIXES(IPCSupportTest, MasterSlaveInternal);
   FRIEND_TEST_ALL_PREFIXES(IPCSupportTest, MultiprocessMasterSlaveInternal);
   friend void MultiprocessMasterSlaveInternalTestChildTest();
@@ skipping 15 matching lines @@
   // the master and slave (returning the slave's handle).
   embedder::ScopedPlatformHandle ConnectToMasterInternal(
       const ConnectionIdentifier& connection_id);
 
   ConnectionManager* connection_manager() const {
     return connection_manager_.get();
   }
 
   // These are all set on construction and reset by |ShutdownOnIOThread()|.
   embedder::ProcessType process_type_;
-  util::RefPtr<embedder::PlatformTaskRunner> delegate_thread_task_runner_;
+  util::RefPtr<platform::TaskRunner> delegate_thread_task_runner_;
   embedder::ProcessDelegate* process_delegate_;
-  util::RefPtr<embedder::PlatformTaskRunner> io_thread_task_runner_;
+  util::RefPtr<platform::TaskRunner> io_thread_task_runner_;
 
   std::unique_ptr<ConnectionManager> connection_manager_;
   std::unique_ptr<ChannelManager> channel_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(IPCSupport);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_IPC_SUPPORT_H_