Partial revert of 'Refactor CompositorWorkerManager'

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 1128 matching lines @@
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kIPCSyncCompositing);
   DCHECK(!sync_compositor_factory || !using_ipc_sync_compositing);
 
   if (sync_compositor_factory) {
     compositor_task_runner_ =
         sync_compositor_factory->GetCompositorTaskRunner();
   }
 #endif
   if (!compositor_task_runner_.get()) {
-    base::Thread::Options options;
+
+    compositor_thread_.reset(new base::Thread("Compositor"));
+    base::Thread::Options compositor_thread_options;
 #if defined(OS_ANDROID)
-    options.priority = base::ThreadPriority::DISPLAY;
+    compositor_thread_options.priority = base::ThreadPriority::DISPLAY;
 #endif
-    compositor_thread_ =
-        blink_platform_impl_->createThreadWithOptions("Compositor", options);
-    compositor_task_runner_ = compositor_thread_->TaskRunner();
+    compositor_thread_->StartWithOptions(compositor_thread_options);
+    compositor_task_runner_ = compositor_thread_->task_runner();
     compositor_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(base::IgnoreResult(&ThreadRestrictions::SetIOAllowed),
                    false));
-    blink_platform_impl_->set_compositor_thread(compositor_thread_.get());
   }
 
   InputHandlerManagerClient* input_handler_manager_client = NULL;
 #if defined(OS_ANDROID)
   if (using_ipc_sync_compositing) {
     sync_compositor_message_filter_ =
         new SynchronousCompositorFilter(compositor_task_runner_);
     AddFilter(sync_compositor_message_filter_.get());
     input_handler_manager_client = sync_compositor_message_filter_.get();
   } else if (sync_compositor_factory) {
@@ skipping 920 matching lines @@
 }
 
 void RenderThreadImpl::PendingRenderFrameConnect::OnConnectionError() {
   size_t erased =
       RenderThreadImpl::current()->pending_render_frame_connects_.erase(
           routing_id_);
   DCHECK_EQ(1u, erased);
 }
 
 }  // namespace content