Introduce ChannelMojo

content/child/child_thread.h

 // Copyright (c) 2012 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 CONTENT_CHILD_CHILD_THREAD_H_
 #define CONTENT_CHILD_CHILD_THREAD_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 39 matching lines @@
 class QuotaMessageFilter;
 class ResourceDispatcher;
 class SocketStreamDispatcher;
 class ThreadSafeSender;
 class WebSocketDispatcher;
 struct RequestInfo;
 
 // The main thread of a child process derives from this class.
 class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
  public:
+  struct CONTENT_EXPORT InitOptions {

[darin (slow to review), 2014/07/23 23:03:33]

nit: You could probably just call this Options, which would be similar to
base::Thread::Options.

[Hajime Morrita, 2014/07/24 00:38:44]

Done.

+    explicit InitOptions(std::string name = "", bool mojo = false)

[darin (slow to review), 2014/07/23 23:03:33]

nit: Google C++ style recommends against using default arguments. it is OK to
provide overrides of the constructor however :-/

[Hajime Morrita, 2014/07/24 00:38:44]

Done. I should re-read the coding guideline to unlearn Blink style :-(

+        : channel_name(name), use_mojo_channel(mojo) {}
+
+    std::string channel_name;
+    bool use_mojo_channel;
+  };
+
   // Creates the thread.
   ChildThread();
   // Used for single-process mode and for in process gpu mode.
-  explicit ChildThread(const std::string& channel_name);
+  explicit ChildThread(const InitOptions& options);
   // ChildProcess::main_thread() is reset after Shutdown(), and before the
   // destructor, so any subsystem that relies on ChildProcess::main_thread()
   // must be terminated before Shutdown returns. In particular, if a subsystem
   // has a thread that post tasks to ChildProcess::main_thread(), that thread
   // should be joined in Shutdown().
   virtual ~ChildThread();
   virtual void Shutdown();
 
   // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
@@ skipping 100 matching lines @@
   class ChildThreadMessageRouter : public MessageRouter {
    public:
     // |sender| must outlive this object.
     explicit ChildThreadMessageRouter(IPC::Sender* sender);
     virtual bool Send(IPC::Message* msg) OVERRIDE;
 
    private:
     IPC::Sender* const sender_;
   };
 
-  void Init();
+  void Init(const InitOptions& options);
+  scoped_ptr<IPC::SyncChannel> CreateChannel(bool use_mojo_channel);
 
   // IPC message handlers.
   void OnShutdown();
   void OnSetProfilerStatus(tracked_objects::ThreadData::Status status);
   void OnGetChildProfilerData(int sequence_number);
   void OnDumpHandles();
   void OnProcessBackgrounded(bool background);
 #ifdef IPC_MESSAGE_LOG_ENABLED
   void OnSetIPCLoggingEnabled(bool enable);
 #endif
@@ skipping 55 matching lines @@
   scoped_ptr<base::PowerMonitor> power_monitor_;
 
   bool in_browser_process_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_H_