content: Refactor ChildThreadImpl::Options

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 a5d7e58f3518103e619b12796fa08729eb116095..630ad6b45831fb9d531882660bc4377fb865827c 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -433,18 +433,28 @@ RenderThreadImpl* RenderThreadImpl::current() {
 // When we run plugins in process, we actually run them on the render thread,
 // which means that we need to make the render thread pump UI events.
 RenderThreadImpl::RenderThreadImpl()
-    : ChildThreadImpl(Options(ShouldUseMojoChannel())) {
+    : ChildThreadImpl(Options::Builder()
+                          .InBrowserProcess(true)
+                          .UseMojoChannel(ShouldUseMojoChannel())
+                          .Build()) {
   Init();
 }
 
 RenderThreadImpl::RenderThreadImpl(const std::string& channel_name)
-    : ChildThreadImpl(Options(channel_name, ShouldUseMojoChannel())) {
+    : ChildThreadImpl(Options::Builder()
+                          .InBrowserProcess(true)
+                          .UseMojoChannel(ShouldUseMojoChannel())
+                          .WithChannelName(channel_name)
+                          .Build()) {
   Init();
 }
 
 RenderThreadImpl::RenderThreadImpl(
     scoped_ptr<base::MessageLoop> main_message_loop)
-    : ChildThreadImpl(Options(ShouldUseMojoChannel())),
+    : ChildThreadImpl(Options::Builder()
+                          .InBrowserProcess(true)

[no sievers, 2015/03/04 19:10:49]

Has this been wrong even before your patch?
This is the constructor used when running in the renderer process, but it looks
like it's been using an Options constructor that sets |in_browser_process| to
|true|.

[Sami, 2015/03/04 19:21:16]

Yes, that's one of the reasons why I wanted to do this refactoring :) I'll add a
TODO here and keep the existing behavior for this patch.

+                          .UseMojoChannel(ShouldUseMojoChannel())
+                          .Build()),
       main_message_loop_(main_message_loop.Pass()) {
   Init();
 }