content: Refactor ChildThreadImpl::Options

content/renderer/render_thread_impl.cc

 // 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.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 415 matching lines @@
   }
 }
 
 RenderThreadImpl* RenderThreadImpl::current() {
   return lazy_tls.Pointer()->Get();
 }
 
 // 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();
 }
 
 void RenderThreadImpl::Init() {
   TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
 
   base::trace_event::TraceLog::GetInstance()->SetThreadSortIndex(
       base::PlatformThread::CurrentId(),
       kTraceEventRendererMainThreadSortIndex);
@@ skipping 1361 matching lines @@
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     mojo::ServiceProviderPtr exposed_services)
     : services(services.Pass()),
       exposed_services(exposed_services.Pass()) {
 }
 
 RenderThreadImpl::PendingRenderFrameConnect::~PendingRenderFrameConnect() {
 }
 
 }  // namespace content