Enable ChannelMojo for non-renderer child processes

content/renderer/render_thread_impl.cc

Index: content/renderer/render_thread_impl.cc
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 3d713e06ac3cd17331275ad4d832264e3a09c043..26e794173373d50462845bb03d44582df169ffcb 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -68,7 +68,6 @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/mojo_channel_switches.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
@@ -445,10 +444,7 @@ RenderThreadImpl* RenderThreadImpl::current() {
 }
 
 RenderThreadImpl::RenderThreadImpl(const InProcessChildThreadParams& params)
-    : ChildThreadImpl(Options::Builder()
-                          .InBrowserProcess(params)
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .Build()) {
+    : ChildThreadImpl(Options::Builder().InBrowserProcess(params).Build()) {
   Init();
 }
 
@@ -456,9 +452,7 @@ RenderThreadImpl::RenderThreadImpl(const InProcessChildThreadParams& params)
 // which means that we need to make the render thread pump UI events.
 RenderThreadImpl::RenderThreadImpl(
     scoped_ptr<base::MessageLoop> main_message_loop)
-    : ChildThreadImpl(Options::Builder()
-                          .UseMojoChannel(ShouldUseMojoChannel())
-                          .Build()),
+    : ChildThreadImpl(Options::Builder().Build()),
       main_message_loop_(main_message_loop.Pass()) {
   Init();
 }