| Index: content/renderer/render_thread_impl.cc
|
| diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
|
| index f9d02f198b98317271e1bc280df193c90141f108..00a93c53596096ac5727427ff25b1c1e0799ead4 100644
|
| --- a/content/renderer/render_thread_impl.cc
|
| +++ b/content/renderer/render_thread_impl.cc
|
| @@ -425,30 +425,19 @@ 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::Builder()
|
| - .InBrowserProcess(true)
|
| - .UseMojoChannel(ShouldUseMojoChannel())
|
| - .Build()) {
|
| - Init();
|
| -}
|
| -
|
| -RenderThreadImpl::RenderThreadImpl(const std::string& channel_name)
|
| +RenderThreadImpl::RenderThreadImpl(const InProcessChildThreadParams& params)
|
| : ChildThreadImpl(Options::Builder()
|
| - .InBrowserProcess(true)
|
| + .InBrowserProcess(params)
|
| .UseMojoChannel(ShouldUseMojoChannel())
|
| - .WithChannelName(channel_name)
|
| .Build()) {
|
| Init();
|
| }
|
|
|
| +// 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(
|
| scoped_ptr<base::MessageLoop> main_message_loop)
|
| : ChildThreadImpl(Options::Builder()
|
| - // TODO(skyostil): This should be set to false.
|
| - .InBrowserProcess(true)
|
| .UseMojoChannel(ShouldUseMojoChannel())
|
| .Build()),
|
| main_message_loop_(main_message_loop.Pass()) {
|
|
|