Rename RenderThread to RenderThreadImpl

BUG=98716
TBR=ananta
Review URL: http://codereview.chromium.org/8171015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104386 0039d316-1c4b-4281-b951-d872f2087c98

40 files changed, 274 insertions, 303 deletions

diff --git a/content/renderer/devtools_client.cc b/content/renderer/devtools_client.cc
index 2d657e6..4d9c958 100644
--- a/content/renderer/devtools_client.cc
+++ b/content/renderer/devtools_client.cc
@@ -9,7 +9,7 @@
 #include "base/utf_string_conversions.h"
 #include "content/common/content_switches.h"
 #include "content/common/devtools_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDevToolsFrontend.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
@@ -36,7 +36,7 @@ void DevToolsClient::SendToAgent(const IPC::Message& tools_agent_message) {
 }
 
 bool DevToolsClient::OnMessageReceived(const IPC::Message& message) {
-  DCHECK(RenderThread::current()->message_loop() == MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
 
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DevToolsClient, message)
diff --git a/content/renderer/gpu/command_buffer_proxy.cc b/content/renderer/gpu/command_buffer_proxy.cc
index 732703f..907eb072 100644
--- a/content/renderer/gpu/command_buffer_proxy.cc
+++ b/content/renderer/gpu/command_buffer_proxy.cc
@@ -10,12 +10,12 @@
 #include "base/shared_memory.h"
 #include "base/stl_util.h"
 #include "base/task.h"
+#include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/plugin_channel_host.h"
-#include "content/renderer/render_thread.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "ui/gfx/size.h"
 
diff --git a/content/renderer/gpu/gpu_channel_host.cc b/content/renderer/gpu/gpu_channel_host.cc
index b6e2d80..5417e38 100644
--- a/content/renderer/gpu/gpu_channel_host.cc
+++ b/content/renderer/gpu/gpu_channel_host.cc
@@ -11,7 +11,7 @@
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/gpu/transport_texture_service.h"
 #include "content/renderer/render_process.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 
@@ -123,7 +123,7 @@ GpuChannelHost::~GpuChannelHost() {
 void GpuChannelHost::Connect(
     const IPC::ChannelHandle& channel_handle,
     base::ProcessHandle renderer_process_for_gpu) {
-  DCHECK(RenderThread::current());
+  DCHECK(RenderThreadImpl::current());
   // Open a channel to the GPU process. We pass NULL as the main listener here
   // since we need to filter everything to route it to the right thread.
   channel_.reset(new IPC::SyncChannel(
@@ -182,12 +182,12 @@ bool GpuChannelHost::Send(IPC::Message* message) {
   // Currently we need to choose between two different mechanisms for sending.
   // On the main thread we use the regular channel Send() method, on another
   // thread we use SyncMessageFilter. We also have to be careful interpreting
-  // RenderThread::current() since it might return NULL during shutdown, while
-  // we are actually calling from the main thread (discard message then).
+  // RenderThreadImpl::current() since it might return NULL during shutdown,
+  // impl we are actually calling from the main thread (discard message then).
   //
   // TODO: Can we just always use sync_filter_ since we setup the channel
   //       without a main listener?
-  if (RenderThread::current()) {
+  if (RenderThreadImpl::current()) {
     if (channel_.get())
       return channel_->Send(message);
   } else if (MessageLoop::current()) {
diff --git a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc
index 05697cb..c9c6d59 100644
--- a/content/renderer/gpu/gpu_video_decode_accelerator_host.cc
+++ b/content/renderer/gpu/gpu_video_decode_accelerator_host.cc
@@ -11,7 +11,7 @@
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 
@@ -26,8 +26,7 @@ GpuVideoDecodeAcceleratorHost::GpuVideoDecodeAcceleratorHost(
       client_(client) {
   DCHECK(channel_);
   DCHECK(client_);
-  DCHECK(RenderThread::current());
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
 }
 
 GpuVideoDecodeAcceleratorHost::~GpuVideoDecodeAcceleratorHost() {}
diff --git a/content/renderer/gpu/renderer_gl_context.cc b/content/renderer/gpu/renderer_gl_context.cc
index 255bd13..af93c92 100644
--- a/content/renderer/gpu/renderer_gl_context.cc
+++ b/content/renderer/gpu/renderer_gl_context.cc
@@ -16,7 +16,6 @@
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/gpu/transport_texture_host.h"
 #include "content/renderer/gpu/transport_texture_service.h"
-#include "content/renderer/render_thread.h"
 #include "content/renderer/render_widget.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
index 51e8e16..46e74d7 100644
--- a/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.cc
@@ -24,7 +24,7 @@
 #include "base/synchronization/lock.h"
 #include "content/common/content_switches.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/constants.h"
@@ -72,7 +72,7 @@ bool WebGraphicsContext3DCommandBufferImpl::initialize(
     bool render_directly_to_web_view) {
   DCHECK(!context_);
   TRACE_EVENT0("gpu", "WebGfxCtx3DCmdBfrImpl::initialize");
-  RenderThread* render_thread = RenderThread::current();
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
   if (!render_thread)
     return false;
   host_ = render_thread->EstablishGpuChannelSync(
diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc
index 3e57137..ee68cdc 100644
--- a/content/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db_dispatcher.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/indexed_db_dispatcher.h"
 
 #include "content/common/indexed_db_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_webidbcursor_impl.h"
 #include "content/renderer/renderer_webidbdatabase_impl.h"
@@ -71,7 +71,7 @@ void IndexedDBDispatcher::RequestIDBCursorUpdate(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorUpdate(idb_cursor_id, response_id, value, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
@@ -85,7 +85,7 @@ void IndexedDBDispatcher::RequestIDBCursorContinue(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorContinue(idb_cursor_id, response_id, key, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
@@ -98,7 +98,7 @@ void IndexedDBDispatcher::RequestIDBCursorDelete(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorDelete(idb_cursor_id, response_id, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
@@ -122,7 +122,7 @@ void IndexedDBDispatcher::RequestIDBFactoryOpen(
   params.response_id = pending_callbacks_.Add(callbacks.release());
   params.origin = origin;
   params.name = name;
-  RenderThread::current()->Send(new IndexedDBHostMsg_FactoryOpen(params));
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_FactoryOpen(params));
 }
 
 void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames(
@@ -141,7 +141,7 @@ void IndexedDBDispatcher::RequestIDBFactoryGetDatabaseNames(
   params.routing_id = render_view->routing_id();
   params.response_id = pending_callbacks_.Add(callbacks.release());
   params.origin = origin;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_FactoryGetDatabaseNames(params));
 }
 
@@ -163,12 +163,12 @@ void IndexedDBDispatcher::RequestIDBFactoryDeleteDatabase(
   params.response_id = pending_callbacks_.Add(callbacks.release());
   params.origin = origin;
   params.name = name;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_FactoryDeleteDatabase(params));
 }
 
 void IndexedDBDispatcher::RequestIDBDatabaseClose(int32 idb_database_id) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseClose(idb_database_id));
   pending_database_callbacks_.Remove(idb_database_id);
 }
@@ -179,8 +179,8 @@ void IndexedDBDispatcher::RequestIDBDatabaseClose(int32 idb_database_id) {
   scoped_ptr<WebIDBDatabaseCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_database_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(new IndexedDBHostMsg_DatabaseOpen(response_id,
-      idb_database_id));
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_DatabaseOpen(
+      response_id, idb_database_id));
 }
 
 void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(
@@ -191,7 +191,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseSetVersion(idb_database_id, response_id,
                                             version, ec));
   if (*ec)
@@ -215,7 +215,7 @@ void IndexedDBDispatcher::RequestIDBIndexOpenObjectCursor(
   params.direction = direction;
   params.idb_index_id = idb_index_id;
   params.transaction_id = TransactionId(transaction);
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexOpenObjectCursor(params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
@@ -240,7 +240,7 @@ void IndexedDBDispatcher::RequestIDBIndexOpenKeyCursor(
   params.direction = direction;
   params.idb_index_id = idb_index_id;
   params.transaction_id = TransactionId(transaction);
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexOpenKeyCursor(params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
@@ -254,7 +254,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetObject(
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexGetObject(
           idb_index_id, response_id, key,
           TransactionId(transaction), ec));
@@ -270,7 +270,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetKey(
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexGetKey(
           idb_index_id, response_id, key,
           TransactionId(transaction), ec));
@@ -287,7 +287,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreGet(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreGet(
           idb_object_store_id, response_id,
           key, TransactionId(transaction), ec));
@@ -311,7 +311,7 @@ void IndexedDBDispatcher::RequestIDBObjectStorePut(
   params.key = key;
   params.put_mode = put_mode;
   params.transaction_id = TransactionId(transaction);
-  RenderThread::current()->Send(new IndexedDBHostMsg_ObjectStorePut(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_ObjectStorePut(
       params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
@@ -326,7 +326,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreDelete(
           idb_object_store_id, response_id,
           key, TransactionId(transaction), ec));
@@ -342,7 +342,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreClear(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreClear(
           idb_object_store_id, response_id,
           TransactionId(transaction), ec));
@@ -367,7 +367,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreOpenCursor(
   params.direction = direction;
   params.idb_object_store_id = idb_object_store_id;
   params.transaction_id = TransactionId(transaction);
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreOpenCursor(params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc
index 68a8756..1667950 100644
--- a/content/renderer/media/audio_device.cc
+++ b/content/renderer/media/audio_device.cc
@@ -10,7 +10,7 @@
 #include "content/common/child_process.h"
 #include "content/common/media/audio_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_util.h"
 
 AudioDevice::AudioDevice(size_t buffer_size,
@@ -25,7 +25,7 @@ AudioDevice::AudioDevice(size_t buffer_size,
       audio_delay_milliseconds_(0),
       volume_(1.0),
       stream_id_(0) {
-  filter_ = RenderThread::current()->audio_message_filter();
+  filter_ = RenderThreadImpl::current()->audio_message_filter();
   audio_data_.reserve(channels);
   for (int i = 0; i < channels; ++i) {
     float* channel_data = new float[buffer_size];
@@ -238,7 +238,7 @@ double AudioDevice::GetAudioHardwareSampleRate() {
   // Uses cached value if possible.
   static double hardware_sample_rate = 0;
   if (!hardware_sample_rate) {
-    RenderThread::current()->Send(
+    RenderThreadImpl::current()->Send(
         new ViewHostMsg_GetHardwareSampleRate(&hardware_sample_rate));
   }
   return hardware_sample_rate;
diff --git a/content/renderer/media/audio_input_device.cc b/content/renderer/media/audio_input_device.cc
index 1ba084d..2c32d45 100644
--- a/content/renderer/media/audio_input_device.cc
+++ b/content/renderer/media/audio_input_device.cc
@@ -9,7 +9,7 @@
 #include "content/common/child_process.h"
 #include "content/common/media/audio_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_util.h"
 
 AudioInputDevice::AudioInputDevice(size_t buffer_size,
@@ -24,7 +24,7 @@ AudioInputDevice::AudioInputDevice(size_t buffer_size,
       stream_id_(0),
       session_id_(0),
       pending_device_ready_(false) {
-  filter_ = RenderThread::current()->audio_input_message_filter();
+  filter_ = RenderThreadImpl::current()->audio_input_message_filter();
   audio_data_.reserve(channels);
 #if defined(OS_MACOSX)
   VLOG(1) << "Using AUDIO_PCM_LOW_LATENCY as input mode on Mac OS X.";
diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc
index c81e658..38e5ee59 100644
--- a/content/renderer/media/audio_renderer_impl.cc
+++ b/content/renderer/media/audio_renderer_impl.cc
@@ -12,7 +12,7 @@
 #include "content/common/child_process.h"
 #include "content/common/content_switches.h"
 #include "content/common/media/audio_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "media/audio/audio_buffers_state.h"
 #include "media/audio/audio_output_controller.h"
@@ -35,7 +35,7 @@ AudioRendererImpl::AudioRendererImpl()
       pending_request_(false),
       prerolling_(false),
       preroll_bytes_(0) {
-  filter_ = RenderThread::current()->audio_message_filter();
+  filter_ = RenderThreadImpl::current()->audio_message_filter();
   // Figure out if we are planning to use high or low latency code path.
   // We are initializing only one variable and double initialization is Ok,
   // so there would not be any issues caused by CPU memory model.
diff --git a/content/renderer/media/audio_renderer_impl_unittest.cc b/content/renderer/media/audio_renderer_impl_unittest.cc
index 7810e6a0..a1cdb73 100644
--- a/content/renderer/media/audio_renderer_impl_unittest.cc
+++ b/content/renderer/media/audio_renderer_impl_unittest.cc
@@ -13,7 +13,7 @@
 #include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/mock_content_renderer_client.h"
 #include "content/renderer/render_process.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "ipc/ipc_channel.h"
 #include "media/base/data_buffer.h"
 #include "media/base/mock_callback.h"
@@ -145,7 +145,7 @@ class AudioRendererImplTest
     ASSERT_TRUE(channel_->Connect());
 
     mock_process_.reset(new MockRenderProcess);
-    render_thread_ = new RenderThread(kThreadName);
+    render_thread_ = new RenderThreadImpl(kThreadName);
     mock_process_->set_main_thread(render_thread_);
 
     // Create temporary shared memory.
@@ -204,7 +204,7 @@ class AudioRendererImplTest
   MessageLoopForIO message_loop_;
   content::MockContentRendererClient mock_content_renderer_client_;
   scoped_ptr<IPC::Channel> channel_;
-  RenderThread* render_thread_;  // owned by mock_process_
+  RenderThreadImpl* render_thread_;  // owned by mock_process_
   scoped_ptr<MockRenderProcess> mock_process_;
   base::SharedMemory shared_mem_;
   media::MockFilterHost host_;
diff --git a/content/renderer/media/render_media_log.cc b/content/renderer/media/render_media_log.cc
index 53b3522..ae2c81f 100644
--- a/content/renderer/media/render_media_log.cc
+++ b/content/renderer/media/render_media_log.cc
@@ -6,19 +6,19 @@
 
 #include "base/message_loop_proxy.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 
 RenderMediaLog::RenderMediaLog()
     : render_loop_(base::MessageLoopProxy::current()) {
-  DCHECK(RenderThread::current()) <<
+  DCHECK(RenderThreadImpl::current()) <<
       "RenderMediaLog must be constructed on the render thread";
 }
 
 void RenderMediaLog::AddEvent(media::MediaLogEvent* event) {
   scoped_ptr<media::MediaLogEvent> e(event);
 
-  if (RenderThread::current()) {
-    RenderThread::current()->Send(new ViewHostMsg_MediaLogEvent(*e));
+  if (RenderThreadImpl::current()) {
+    RenderThreadImpl::current()->Send(new ViewHostMsg_MediaLogEvent(*e));
   } else {
     render_loop_->PostTask(FROM_HERE,
         NewRunnableMethod(this, &RenderMediaLog::AddEvent, e.release()));
diff --git a/content/renderer/media/video_capture_message_filter.cc b/content/renderer/media/video_capture_message_filter.cc
index 4a88e2d..f4c4b15 100644
--- a/content/renderer/media/video_capture_message_filter.cc
+++ b/content/renderer/media/video_capture_message_filter.cc
@@ -6,7 +6,6 @@
 
 #include "content/common/media/video_capture_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
 
 VideoCaptureMessageFilter::VideoCaptureMessageFilter()
     : last_device_id_(0),
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index b0049d6..d467476 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 
 #include "base/string_util.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "media/audio/audio_util.h"
 
 static const int64 kMillisecondsBetweenProcessCalls = 5000;
@@ -30,7 +30,7 @@ WebRtcAudioDeviceImpl::WebRtcAudioDeviceImpl()
       playing_(false),
       recording_(false) {
     VLOG(1) << "WebRtcAudioDeviceImpl::WebRtcAudioDeviceImpl()";
-    DCHECK(RenderThread::current()) <<
+    DCHECK(RenderThreadImpl::current()) <<
         "WebRtcAudioDeviceImpl must be constructed on the render thread";
 }
 
diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index 1fe71e0..ce074b5 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -8,7 +8,6 @@
 #include "base/task.h"
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
diff --git a/content/renderer/pepper_platform_context_3d_impl.cc b/content/renderer/pepper_platform_context_3d_impl.cc
index c978903..6b50700 100644
--- a/content/renderer/pepper_platform_context_3d_impl.cc
+++ b/content/renderer/pepper_platform_context_3d_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/gpu/renderer_gl_context.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
@@ -49,7 +49,7 @@ bool PlatformContext3DImpl::Init(const int32* attrib_list) {
   if (!parent_context_.get())
     return false;
 
-  RenderThread* render_thread = RenderThread::current();
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
   if (!render_thread)
     return false;
 
diff --git a/content/renderer/pepper_platform_video_decoder_impl.cc b/content/renderer/pepper_platform_video_decoder_impl.cc
index 81b9857..662d6ec 100644
--- a/content/renderer/pepper_platform_video_decoder_impl.cc
+++ b/content/renderer/pepper_platform_video_decoder_impl.cc
@@ -10,7 +10,7 @@
 #include "base/logging.h"
 #include "content/common/child_process.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 
 using media::BitstreamBuffer;
 
@@ -29,8 +29,7 @@ bool PlatformVideoDecoderImpl::Initialize(Profile profile) {
   if (decoder_)
     return true;
 
-  RenderThread* render_thread = RenderThread::current();
-  DCHECK(render_thread);
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
 
   // This is not synchronous, but subsequent IPC messages will be buffered, so
   // it is okay to immediately send IPC messages through the returned channel.
@@ -84,30 +83,30 @@ void PlatformVideoDecoderImpl::Destroy() {
 }
 
 void PlatformVideoDecoderImpl::NotifyEndOfStream() {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->NotifyEndOfStream();
 }
 
 void PlatformVideoDecoderImpl::NotifyError(
     VideoDecodeAccelerator::Error error) {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->NotifyError(error);
 }
 
 void PlatformVideoDecoderImpl::ProvidePictureBuffers(
     uint32 requested_num_of_buffers,
     const gfx::Size& dimensions) {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->ProvidePictureBuffers(requested_num_of_buffers, dimensions);
 }
 
 void PlatformVideoDecoderImpl::DismissPictureBuffer(int32 picture_buffer_id) {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->DismissPictureBuffer(picture_buffer_id);
 }
 
 void PlatformVideoDecoderImpl::PictureReady(const media::Picture& picture) {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->PictureReady(picture);
 }
 
@@ -117,16 +116,16 @@ void PlatformVideoDecoderImpl::NotifyInitializeDone() {
 
 void PlatformVideoDecoderImpl::NotifyEndOfBitstreamBuffer(
   int32 bitstream_buffer_id) {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->NotifyEndOfBitstreamBuffer(bitstream_buffer_id);
 }
 
 void PlatformVideoDecoderImpl::NotifyFlushDone() {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->NotifyFlushDone();
 }
 
 void PlatformVideoDecoderImpl::NotifyResetDone() {
-  DCHECK_EQ(RenderThread::current()->message_loop(), MessageLoop::current());
+  DCHECK(RenderThreadImpl::current());
   client_->NotifyResetDone();
 }
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 3ea66d2..438afc7 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -39,7 +39,7 @@
 #include "content/renderer/p2p/p2p_transport_impl.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 #include "content/renderer/pepper_platform_video_decoder_impl.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
@@ -128,7 +128,7 @@ class PlatformImage2DImpl
   // On Mac, we have to tell the browser to free the transport DIB.
   virtual ~PlatformImage2DImpl() {
     if (dib_.get()) {
-      RenderThread::current()->Send(
+      RenderThreadImpl::current()->Send(
           new ViewHostMsg_FreeTransportDIB(dib_->id()));
     }
   }
@@ -170,7 +170,7 @@ class PlatformAudioImpl
   PlatformAudioImpl()
       : client_(NULL), stream_id_(0),
         main_message_loop_(MessageLoop::current()) {
-    filter_ = RenderThread::current()->audio_message_filter();
+    filter_ = RenderThreadImpl::current()->audio_message_filter();
   }
 
   virtual ~PlatformAudioImpl() {
@@ -417,7 +417,7 @@ class PlatformVideoCaptureImpl
       : handler_proxy_(new media::VideoCaptureHandlerProxy(
             handler, base::MessageLoopProxy::current())) {
     VideoCaptureImplManager* manager =
-        RenderThread::current()->video_capture_impl_manager();
+        RenderThreadImpl::current()->video_capture_impl_manager();
     // 1 means the "default" video capture device.
     // TODO(piman): Add a way to enumerate devices and pass them through the
     // API.
@@ -427,7 +427,7 @@ class PlatformVideoCaptureImpl
   // Overrides from media::VideoCapture::EventHandler
   virtual ~PlatformVideoCaptureImpl() {
     VideoCaptureImplManager* manager =
-        RenderThread::current()->video_capture_impl_manager();
+        RenderThreadImpl::current()->video_capture_impl_manager();
     manager->RemoveDevice(1, handler_proxy_.get());
   }
 
@@ -906,7 +906,7 @@ PepperPluginDelegateImpl::CreateImage2D(int width, int height) {
   IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(buffer_size,
                                                         true,
                                                         &dib_handle);
-  if (!RenderThread::current()->Send(msg))
+  if (!RenderThreadImpl::current()->Send(msg))
     return NULL;
   if (!TransportDIB::is_valid_handle(dib_handle))
     return NULL;
@@ -1243,8 +1243,8 @@ class AsyncOpenFileSystemURLCallbackTranslator
     callback_->Run(base::PLATFORM_FILE_OK, base::PassPlatformFile(&file));
     // Make sure we won't leak file handle if the requester has died.
     if (file != base::kInvalidPlatformFileValue) {
-      base::FileUtilProxy::Close(
-          RenderThread::current()->GetFileThreadMessageLoopProxy(), file, NULL);
+      base::FileUtilProxy::Close(RenderThreadImpl::current()->
+          GetFileThreadMessageLoopProxy(), file, NULL);
     }
   }
 
@@ -1329,13 +1329,13 @@ base::PlatformFileError PepperPluginDelegateImpl::GetDirContents(
 
 void PepperPluginDelegateImpl::SyncGetFileSystemPlatformPath(
     const GURL& url, FilePath* platform_path) {
-  RenderThread::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
+  RenderThreadImpl::current()->Send(new FileSystemHostMsg_SyncGetPlatformPath(
       url, platform_path));
 }
 
 scoped_refptr<base::MessageLoopProxy>
 PepperPluginDelegateImpl::GetFileThreadMessageLoopProxy() {
-  return RenderThread::current()->GetFileThreadMessageLoopProxy();
+  return RenderThreadImpl::current()->GetFileThreadMessageLoopProxy();
 }
 
 int32_t PepperPluginDelegateImpl::ConnectTcp(
@@ -1498,7 +1498,7 @@ void PepperPluginDelegateImpl::SubscribeToPolicyUpdates(
 std::string PepperPluginDelegateImpl::ResolveProxy(const GURL& url) {
   bool result;
   std::string proxy_result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ViewHostMsg_ResolveProxy(url, &result, &proxy_result));
   return proxy_result;
 }
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index bff576b..b813bb5 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -18,10 +18,10 @@
 #include "base/message_loop.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
+#include "content/common/child_thread.h"
 #include "content/common/content_switches.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread_impl.cc
index 207236a..adfaa5a 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -2,7 +2,7 @@
 // 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.h"
+#include "content/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
@@ -105,9 +105,9 @@ static const double kInitialIdleHandlerDelayS = 1.0 /* seconds */;
 static const int kPopupListBoxMinimumRowHeight = 60;
 #endif
 
-// Keep the global RenderThread in a TLS slot so it is impossible to access
+// Keep the global RenderThreadImpl in a TLS slot so it is impossible to access
 // incorrectly from the wrong thread.
-static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
+static base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> > lazy_tls(
     base::LINKER_INITIALIZED);
 
 class RenderViewZoomer : public content::RenderViewVisitor {
@@ -140,29 +140,6 @@ class RenderViewZoomer : public content::RenderViewVisitor {
 
 }  // namespace
 
-// TODO(jam): move this to content/public/renderer/render_thread.cc once this file is renamed
-namespace content {
-
-// Keep the global RenderThread in a TLS slot so it is impossible to access
-// incorrectly from the wrong thread.
-static base::LazyInstance<base::ThreadLocalPointer<RenderThread> > lazy_tls(
-    base::LINKER_INITIALIZED);
-
-RenderThread* RenderThread::Get() {
-  return lazy_tls.Pointer()->Get();
-}
-
-RenderThread::RenderThread() {
-  lazy_tls.Pointer()->Set(this);
-}
-
-RenderThread::~RenderThread() {
-  lazy_tls.Pointer()->Set(NULL);
-}
-
-}  // namespace content
-
-
 static void* CreateHistogram(
     const char *name, int min, int max, size_t buckets) {
   if (min <= 0)
@@ -177,23 +154,23 @@ static void AddHistogramSample(void* hist, int sample) {
   histogram->Add(sample);
 }
 
-RenderThread* RenderThread::current() {
+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.
-RenderThread::RenderThread() {
+RenderThreadImpl::RenderThreadImpl() {
   Init();
 }
 
-RenderThread::RenderThread(const std::string& channel_name)
+RenderThreadImpl::RenderThreadImpl(const std::string& channel_name)
     : ChildThread(channel_name) {
   Init();
 }
 
-void RenderThread::Init() {
-  TRACE_EVENT_BEGIN_ETW("RenderThread::Init", 0, "");
+void RenderThreadImpl::Init() {
+  TRACE_EVENT_BEGIN_ETW("RenderThreadImpl::Init", 0, "");
 
 #if defined(OS_MACOSX)
   // On Mac, the select popups are rendered by the browser.
@@ -215,7 +192,7 @@ void RenderThread::Init() {
   widget_count_ = 0;
   hidden_widget_count_ = 0;
   idle_notification_delay_in_s_ = kInitialIdleHandlerDelayS;
-  task_factory_.reset(new ScopedRunnableMethodFactory<RenderThread>(this));
+  task_factory_.reset(new ScopedRunnableMethodFactory<RenderThreadImpl>(this));
 
   appcache_dispatcher_.reset(new AppCacheDispatcher(Get()));
   indexed_db_dispatcher_.reset(new IndexedDBDispatcher());
@@ -237,10 +214,10 @@ void RenderThread::Init() {
 
   content::GetContentClient()->renderer()->RenderThreadStarted();
 
-  TRACE_EVENT_END_ETW("RenderThread::Init", 0, "");
+  TRACE_EVENT_END_ETW("RenderThreadImpl::Init", 0, "");
 }
 
-RenderThread::~RenderThread() {
+RenderThreadImpl::~RenderThreadImpl() {
   FOR_EACH_OBSERVER(
       RenderProcessObserver, observers_, OnRenderProcessShutdown());
 
@@ -287,7 +264,7 @@ RenderThread::~RenderThread() {
 #endif
 }
 
-bool RenderThread::Send(IPC::Message* msg) {
+bool RenderThreadImpl::Send(IPC::Message* msg) {
   // Certain synchronous messages cannot always be processed synchronously by
   // the browser, e.g., Chrome frame communicating with the embedding browser.
   // This could cause a complete hang of Chrome if a windowed plug-in is trying
@@ -355,19 +332,19 @@ bool RenderThread::Send(IPC::Message* msg) {
   return rv;
 }
 
-MessageLoop* RenderThread::GetMessageLoop() {
+MessageLoop* RenderThreadImpl::GetMessageLoop() {
   return message_loop();
 }
 
-IPC::SyncChannel* RenderThread::GetChannel() {
+IPC::SyncChannel* RenderThreadImpl::GetChannel() {
   return channel();
 }
 
-ResourceDispatcher* RenderThread::GetResourceDispatcher() {
+ResourceDispatcher* RenderThreadImpl::GetResourceDispatcher() {
   return resource_dispatcher();
 }
 
-std::string RenderThread::GetLocale() {
+std::string RenderThreadImpl::GetLocale() {
   // The browser process should have passed the locale to the renderer via the
   // --lang command line flag.  In single process mode, this will return the
   // wrong value.  TODO(tc): Fix this for single process mode.
@@ -380,38 +357,39 @@ std::string RenderThread::GetLocale() {
   return lang;
 }
 
-void RenderThread::AddRoute(int32 routing_id,
-                            IPC::Channel::Listener* listener) {
+void RenderThreadImpl::AddRoute(int32 routing_id,
+                                IPC::Channel::Listener* listener) {
   widget_count_++;
   return ChildThread::AddRoute(routing_id, listener);
 }
 
-void RenderThread::RemoveRoute(int32 routing_id) {
+void RenderThreadImpl::RemoveRoute(int32 routing_id) {
   widget_count_--;
   return ChildThread::RemoveRoute(routing_id);
 }
 
-void RenderThread::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
+void RenderThreadImpl::AddFilter(IPC::ChannelProxy::MessageFilter* filter) {
   channel()->AddFilter(filter);
 }
 
-void RenderThread::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) {
+void RenderThreadImpl::RemoveFilter(IPC::ChannelProxy::MessageFilter* filter) {
   channel()->RemoveFilter(filter);
 }
 
-void RenderThread::SetOutgoingMessageFilter(
+void RenderThreadImpl::SetOutgoingMessageFilter(
     IPC::ChannelProxy::OutgoingMessageFilter* filter) {
 }
 
-void RenderThread::AddObserver(content::RenderProcessObserver* observer) {
+void RenderThreadImpl::AddObserver(content::RenderProcessObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void RenderThread::RemoveObserver(content::RenderProcessObserver* observer) {
+void RenderThreadImpl::RemoveObserver(
+    content::RenderProcessObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void RenderThread::WidgetHidden() {
+void RenderThreadImpl::WidgetHidden() {
   DCHECK(hidden_widget_count_ < widget_count_);
   hidden_widget_count_++;
 
@@ -424,7 +402,7 @@ void RenderThread::WidgetHidden() {
     ScheduleIdleHandler(kInitialIdleHandlerDelayS);
 }
 
-void RenderThread::WidgetRestored() {
+void RenderThreadImpl::WidgetRestored() {
   DCHECK_GT(hidden_widget_count_, 0);
   hidden_widget_count_--;
   if (!content::GetContentClient()->renderer()->
@@ -435,7 +413,7 @@ void RenderThread::WidgetRestored() {
   idle_timer_.Stop();
 }
 
-void RenderThread::EnsureWebKitInitialized() {
+void RenderThreadImpl::EnsureWebKitInitialized() {
   if (webkit_platform_support_.get())
     return;
 
@@ -535,29 +513,29 @@ void RenderThread::EnsureWebKitInitialized() {
   FOR_EACH_OBSERVER(RenderProcessObserver, observers_, WebKitInitialized());
 }
 
-void RenderThread::RecordUserMetrics(const std::string& action) {
+void RenderThreadImpl::RecordUserMetrics(const std::string& action) {
   Send(new ViewHostMsg_UserMetricsRecordAction(action));
 }
 
-void RenderThread::RegisterExtension(v8::Extension* extension) {
+void RenderThreadImpl::RegisterExtension(v8::Extension* extension) {
   WebScriptController::registerExtension(extension);
   v8_extensions_.insert(extension->name());
 }
 
-bool RenderThread::IsRegisteredExtension(
+bool RenderThreadImpl::IsRegisteredExtension(
     const std::string& v8_extension_name) const {
   return v8_extensions_.find(v8_extension_name) != v8_extensions_.end();
 }
 
-void RenderThread::ScheduleIdleHandler(double initial_delay_s) {
+void RenderThreadImpl::ScheduleIdleHandler(double initial_delay_s) {
   idle_notification_delay_in_s_ = initial_delay_s;
   idle_timer_.Stop();
   idle_timer_.Start(FROM_HERE,
       base::TimeDelta::FromSeconds(static_cast<int64>(initial_delay_s)),
-      this, &RenderThread::IdleHandler);
+      this, &RenderThreadImpl::IdleHandler);
 }
 
-void RenderThread::IdleHandler() {
+void RenderThreadImpl::IdleHandler() {
   #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
   MallocExtension::instance()->ReleaseFreeMemory();
 #endif
@@ -570,34 +548,34 @@ void RenderThread::IdleHandler() {
   // Using floor(delay) has a dampening effect such as:
   //    1s, 1, 1, 2, 2, 2, 2, 3, 3, ...
   // Note that idle_notification_delay_in_s_ would be reset to
-  // kInitialIdleHandlerDelayS in RenderThread::WidgetHidden.
+  // kInitialIdleHandlerDelayS in RenderThreadImpl::WidgetHidden.
   ScheduleIdleHandler(idle_notification_delay_in_s_ +
                       1.0 / (idle_notification_delay_in_s_ + 2.0));
 
   FOR_EACH_OBSERVER(RenderProcessObserver, observers_, IdleNotification());
 }
 
-double RenderThread::GetIdleNotificationDelayInS() const {
+double RenderThreadImpl::GetIdleNotificationDelayInS() const {
   return idle_notification_delay_in_s_;
 }
 
-void RenderThread::SetIdleNotificationDelayInS(
+void RenderThreadImpl::SetIdleNotificationDelayInS(
     double idle_notification_delay_in_s) {
   idle_notification_delay_in_s_ = idle_notification_delay_in_s;
 }
 
 #if defined(OS_WIN)
-void RenderThread::PreCacheFont(const LOGFONT& log_font) {
+void RenderThreadImpl::PreCacheFont(const LOGFONT& log_font) {
   Send(new ChildProcessHostMsg_PreCacheFont(log_font));
 }
 
-void RenderThread::ReleaseCachedFonts() {
+void RenderThreadImpl::ReleaseCachedFonts() {
   Send(new ChildProcessHostMsg_ReleaseCachedFonts());
 }
 
 #endif  // OS_WIN
 
-int32 RenderThread::RoutingIDForCurrentContext() {
+int32 RenderThreadImpl::RoutingIDForCurrentContext() {
   int32 routing_id = MSG_ROUTING_CONTROL;
   if (v8::Context::InContext()) {
     WebFrame* frame = WebFrame::frameForCurrentContext();
@@ -612,21 +590,21 @@ int32 RenderThread::RoutingIDForCurrentContext() {
   return routing_id;
 }
 
-void RenderThread::DoNotSuspendWebKitSharedTimer() {
+void RenderThreadImpl::DoNotSuspendWebKitSharedTimer() {
   suspend_webkit_shared_timer_ = false;
 }
 
-void RenderThread::DoNotNotifyWebKitOfModalLoop() {
+void RenderThreadImpl::DoNotNotifyWebKitOfModalLoop() {
   notify_webkit_of_modal_loop_ = false;
 }
 
-void RenderThread::OnSetZoomLevelForCurrentURL(const GURL& url,
-                                               double zoom_level) {
+void RenderThreadImpl::OnSetZoomLevelForCurrentURL(const GURL& url,
+                                                   double zoom_level) {
   RenderViewZoomer zoomer(url, zoom_level);
   RenderView::ForEach(&zoomer);
 }
 
-void RenderThread::OnDOMStorageEvent(
+void RenderThreadImpl::OnDOMStorageEvent(
     const DOMStorageMsg_Event_Params& params) {
   if (!dom_storage_event_dispatcher_.get())
     dom_storage_event_dispatcher_.reset(WebStorageEventDispatcher::create());
@@ -635,7 +613,7 @@ void RenderThread::OnDOMStorageEvent(
       params.storage_type == DOM_STORAGE_LOCAL);
 }
 
-bool RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
+bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) {
   ObserverListBase<RenderProcessObserver>::Iterator it(observers_);
   RenderProcessObserver* observer;
   while ((observer = it.GetNext()) != NULL) {
@@ -650,7 +628,7 @@ bool RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
     return true;
 
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RenderThread, msg)
+  IPC_BEGIN_MESSAGE_MAP(RenderThreadImpl, msg)
     IPC_MESSAGE_HANDLER(ViewMsg_SetZoomLevelForCurrentURL,
                         OnSetZoomLevelForCurrentURL)
     IPC_MESSAGE_HANDLER(ViewMsg_SetNextPageID, OnSetNextPageID)
@@ -666,7 +644,7 @@ bool RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
   return handled;
 }
 
-void RenderThread::OnSetNextPageID(int32 next_page_id) {
+void RenderThreadImpl::OnSetNextPageID(int32 next_page_id) {
   // This should only be called at process initialization time, so we shouldn't
   // have to worry about thread-safety.
   RenderView::SetNextPageID(next_page_id);
@@ -675,7 +653,7 @@ void RenderThread::OnSetNextPageID(int32 next_page_id) {
 // Called when to register CSS Color name->system color mappings.
 // We update the colors one by one and then tell WebKit to refresh all render
 // views.
-void RenderThread::OnSetCSSColors(
+void RenderThreadImpl::OnSetCSSColors(
     const std::vector<CSSColors::CSSColorMapping>& colors) {
   EnsureWebKitInitialized();
   size_t num_colors = colors.size();
@@ -693,7 +671,7 @@ void RenderThread::OnSetCSSColors(
   WebKit::setNamedColors(color_names.get(), web_colors.get(), num_colors);
 }
 
-void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) {
+void RenderThreadImpl::OnCreateNewView(const ViewMsg_New_Params& params) {
   EnsureWebKitInitialized();
   // When bringing in render_view, also bring in webkit's glue and jsbindings.
   RenderView::Create(
@@ -708,7 +686,7 @@ void RenderThread::OnCreateNewView(const ViewMsg_New_Params& params) {
       params.frame_name);
 }
 
-GpuChannelHost* RenderThread::EstablishGpuChannelSync(
+GpuChannelHost* RenderThreadImpl::EstablishGpuChannelSync(
     content::CauseForGpuLaunch cause_for_gpu_launch) {
   if (gpu_channel_.get()) {
     // Do nothing if we already have a GPU channel or are already
@@ -749,7 +727,7 @@ GpuChannelHost* RenderThread::EstablishGpuChannelSync(
   return GetGpuChannel();
 }
 
-GpuChannelHost* RenderThread::GetGpuChannel() {
+GpuChannelHost* RenderThreadImpl::GetGpuChannel() {
   if (!gpu_channel_.get())
     return NULL;
 
@@ -759,7 +737,7 @@ GpuChannelHost* RenderThread::GetGpuChannel() {
   return gpu_channel_.get();
 }
 
-void RenderThread::OnPurgePluginListCache(bool reload_pages) {
+void RenderThreadImpl::OnPurgePluginListCache(bool reload_pages) {
   EnsureWebKitInitialized();
   // The call below will cause a GetPlugins call with refresh=true, but at this
   // point we already know that the browser has refreshed its list, so disable
@@ -770,13 +748,13 @@ void RenderThread::OnPurgePluginListCache(bool reload_pages) {
   plugin_refresh_allowed_ = true;
 }
 
-void RenderThread::OnNetworkStateChanged(bool online) {
+void RenderThreadImpl::OnNetworkStateChanged(bool online) {
   EnsureWebKitInitialized();
   WebNetworkStateNotifier::setOnLine(online);
 }
 
 scoped_refptr<base::MessageLoopProxy>
-RenderThread::GetFileThreadMessageLoopProxy() {
+RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
diff --git a/content/renderer/render_thread.h b/content/renderer/render_thread_impl.h
index 16ffc87..7da8d30 100644
--- a/content/renderer/render_thread.h
+++ b/content/renderer/render_thread_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_RENDERER_RENDER_THREAD_H_
-#define CONTENT_RENDERER_RENDER_THREAD_H_
+#ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
+#define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #pragma once
 
 #include <set>
@@ -67,7 +67,7 @@ namespace v8 {
 class Extension;
 }
 
-// The RenderThread class represents a background thread where RenderView
+// The RenderThreadImpl class represents a background thread where RenderView
 // instances live.  The RenderThread supports an API that is used by its
 // consumer to talk indirectly to the RenderViews and supporting objects.
 // Likewise, it provides an API for the RenderViews to talk back to the main
@@ -76,15 +76,15 @@ class Extension;
 // Most of the communication occurs in the form of IPC messages.  They are
 // routed to the RenderThread according to the routing IDs of the messages.
 // The routing IDs correspond to RenderView instances.
-class CONTENT_EXPORT RenderThread : public content::RenderThread,
-                                    public ChildThread {
+class CONTENT_EXPORT RenderThreadImpl : public content::RenderThread,
+                                        public ChildThread {
  public:
-  static RenderThread* current();
+  static RenderThreadImpl* current();
 
-  RenderThread();
+  RenderThreadImpl();
   // Constructor that's used when running in single process mode.
-  explicit RenderThread(const std::string& channel_name);
-  virtual ~RenderThread();
+  explicit RenderThreadImpl(const std::string& channel_name);
+  virtual ~RenderThreadImpl();
 
   // Returns the routing ID of the RenderWidget containing the current script
   // execution context (corresponding to WebFrame::frameForCurrentContext).
@@ -188,7 +188,7 @@ class CONTENT_EXPORT RenderThread : public content::RenderThread,
   void OnGetAccessibilityTree();
 
   // These objects live solely on the render thread.
-  scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > task_factory_;
+  scoped_ptr<ScopedRunnableMethodFactory<RenderThreadImpl> > task_factory_;
   scoped_ptr<AppCacheDispatcher> appcache_dispatcher_;
   scoped_ptr<IndexedDBDispatcher> indexed_db_dispatcher_;
   scoped_ptr<RendererWebKitPlatformSupportImpl> webkit_platform_support_;
@@ -222,7 +222,7 @@ class CONTENT_EXPORT RenderThread : public content::RenderThread,
   bool notify_webkit_of_modal_loop_;
 
   // Timer that periodically calls IdleHandler.
-  base::RepeatingTimer<RenderThread> idle_timer_;
+  base::RepeatingTimer<RenderThreadImpl> idle_timer_;
 
   // The channel from the renderer process to the GPU process.
   scoped_refptr<GpuChannelHost> gpu_channel_;
@@ -237,7 +237,7 @@ class CONTENT_EXPORT RenderThread : public content::RenderThread,
 
   ObserverList<content::RenderProcessObserver> observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderThread);
+  DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
-#endif  // CONTENT_RENDERER_RENDER_THREAD_H_
+#endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 10ba01f..7cebedb 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -61,7 +61,7 @@
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
 #include "content/renderer/render_process.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/renderer_accessibility.h"
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
@@ -399,7 +399,7 @@ RenderView::RenderView(content::RenderThread* render_thread,
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kEnableMediaStream)) {
     media_stream_impl_ = new MediaStreamImpl(
-        RenderThread::current()->video_capture_impl_manager());
+        RenderThreadImpl::current()->video_capture_impl_manager());
   }
 
   content::GetContentClient()->renderer()->RenderViewCreated(this);
@@ -949,7 +949,7 @@ void RenderView::OnCopyToFindPboard() {
   WebFrame* frame = webview()->focusedFrame();
   if (frame->hasSelection()) {
     string16 selection = frame->selectionAsText();
-    RenderThread::current()->Send(
+    render_thread_->Send(
         new ClipboardHostMsg_FindPboardWriteStringAsync(selection));
   }
 }
@@ -1300,8 +1300,8 @@ bool RenderView::SendAndRunNestedMessageLoop(IPC::SyncMessage* message) {
   // equivalent of WebView::willEnterModalLoop.  In the case of showModalDialog
   // it is particularly important that we do not call willEnterModalLoop as
   // that would defer resource loads for the dialog itself.
-  if (RenderThread::current())  // Will be NULL during unit tests.
-    RenderThread::current()->DoNotNotifyWebKitOfModalLoop();
+  if (RenderThreadImpl::current())  // Will be NULL during unit tests.
+    RenderThreadImpl::current()->DoNotNotifyWebKitOfModalLoop();
 
   message->EnableMessagePumping();  // Runs a nested message loop.
   return Send(message);
@@ -1530,7 +1530,7 @@ void RenderView::didExecuteCommand(const WebString& command_name) {
       StartsWithASCII(name, "Insert", true) ||
       StartsWithASCII(name, "Delete", true))
     return;
-  RenderThread::current()->RecordUserMetrics(name);
+  RenderThreadImpl::current()->RecordUserMetrics(name);
 }
 
 bool RenderView::handleCurrentKeyboardEvent() {
@@ -1850,8 +1850,8 @@ void RenderView::runModal() {
   // timers so that we do not need to manage the shared timer in such a heavy
   // handed manner.
   //
-  if (RenderThread::current())  // Will be NULL during unit tests.
-    RenderThread::current()->DoNotSuspendWebKitSharedTimer();
+  if (RenderThreadImpl::current())  // Will be NULL during unit tests.
+    RenderThreadImpl::current()->DoNotSuspendWebKitSharedTimer();
 
   SendAndRunNestedMessageLoop(new ViewHostMsg_RunModal(routing_id_));
 }
@@ -1873,7 +1873,7 @@ WebWorker* RenderView::createWorker(WebFrame* frame, WebWorkerClient* client) {
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
   int appcache_host_id = appcache_host ? appcache_host->host_id() : 0;
-  return new WebWorkerProxy(client, RenderThread::current(), routing_id_,
+  return new WebWorkerProxy(client, RenderThreadImpl::current(), routing_id_,
                             appcache_host_id);
 }
 
@@ -1898,7 +1898,7 @@ WebSharedWorker* RenderView::createSharedWorker(
   if (url_mismatch) {
     return NULL;
   } else {
-    return new WebSharedWorkerProxy(RenderThread::current(),
+    return new WebSharedWorkerProxy(RenderThreadImpl::current(),
                                     document_id,
                                     exists,
                                     route_id,
@@ -1948,7 +1948,7 @@ WebApplicationCacheHost* RenderView::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   return new RendererWebApplicationCacheHostImpl(
       FromWebView(frame->view()), client,
-      RenderThread::current()->appcache_dispatcher()->backend_proxy());
+      RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
 }
 
 WebCookieJar* RenderView::cookieJar(WebFrame* frame) {
@@ -2973,14 +2973,14 @@ webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate(
 
 void RenderView::CreatedPluginWindow(gfx::PluginWindowHandle window) {
 #if defined(USE_X11)
-  RenderThread::current()->Send(new ViewHostMsg_CreatePluginContainer(
+  render_thread_->Send(new ViewHostMsg_CreatePluginContainer(
       routing_id(), window));
 #endif
 }
 
 void RenderView::WillDestroyPluginWindow(gfx::PluginWindowHandle window) {
 #if defined(USE_X11)
-  RenderThread::current()->Send(new ViewHostMsg_DestroyPluginContainer(
+  render_thread_->Send(new ViewHostMsg_DestroyPluginContainer(
       routing_id(), window));
 #endif
   CleanupWindowInPluginMoves(window);
@@ -4317,23 +4317,21 @@ void RenderView::registerProtocolHandler(const WebString& scheme,
   if (base.GetOrigin() != absolute_url.GetOrigin()) {
     return;
   }
-  RenderThread::current()->Send(
-      new ViewHostMsg_RegisterProtocolHandler(routing_id_,
-                                              UTF16ToUTF8(scheme),
-                                              absolute_url,
-                                              title));
+  Send(new ViewHostMsg_RegisterProtocolHandler(routing_id_,
+                                               UTF16ToUTF8(scheme),
+                                               absolute_url,
+                                               title));
 }
 
 void RenderView::registerIntentHandler(const WebString& action,
                                        const WebString& type,
                                        const WebString& href,
                                        const WebString& title) {
-  RenderThread::current()->Send(
-      new ViewHostMsg_RegisterIntentHandler(routing_id_,
-                                            action,
-                                            type,
-                                            href,
-                                            title));
+  Send(new ViewHostMsg_RegisterIntentHandler(routing_id_,
+                                             action,
+                                             type,
+                                             href,
+                                             title));
 }
 
 WebKit::WebPageVisibilityState RenderView::visibilityState() const {
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 71e0a84..871a476 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -16,7 +16,7 @@
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/render_process.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc
index 5a8ace6..7d651e1 100644
--- a/content/renderer/render_widget_fullscreen.cc
+++ b/content/renderer/render_widget_fullscreen.cc
@@ -5,7 +5,6 @@
 #include "content/renderer/render_widget_fullscreen.h"
 
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWidget.h"
 
 using WebKit::WebWidget;
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index ed8a853..d84c91e 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -8,7 +8,7 @@
 #include "content/common/view_messages.h"
 #include "content/renderer/gpu/gpu_channel_host.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
@@ -332,8 +332,7 @@ bool RenderWidgetFullscreenPepper::SupportsAsynchronousSwapBuffers() {
 
 void RenderWidgetFullscreenPepper::CreateContext() {
   DCHECK(!context_);
-  RenderThread* render_thread = RenderThread::current();
-  DCHECK(render_thread);
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
   GpuChannelHost* host = render_thread->EstablishGpuChannelSync(
     content::CAUSE_FOR_GPU_LAUNCH_RENDERWIDGETFULLSCREENPEPPER_CREATECONTEXT);
   if (!host)
diff --git a/content/renderer/renderer_glue.cc b/content/renderer/renderer_glue.cc
index b0ca549..f609879 100644
--- a/content/renderer/renderer_glue.cc
+++ b/content/renderer/renderer_glue.cc
@@ -24,7 +24,7 @@
 #include "content/common/url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitPlatformSupport.h"
@@ -58,7 +58,7 @@ void ScopedClipboardWriterGlue::WriteBitmapFromPixels(const void* pixels,
   ViewHostMsg_AllocateSharedMemoryBuffer *msg =
       new ViewHostMsg_AllocateSharedMemoryBuffer(buf_size,
                                                  &shared_mem_handle);
-  if (RenderThread::current()->Send(msg)) {
+  if (RenderThreadImpl::current()->Send(msg)) {
     if (base::SharedMemory::IsHandleValid(shared_mem_handle)) {
       shared_buf_ = new base::SharedMemory(shared_mem_handle, false);
       if (!shared_buf_ || !shared_buf_->Map(buf_size)) {
@@ -107,14 +107,14 @@ ScopedClipboardWriterGlue::~ScopedClipboardWriterGlue() {
     return;
 
   if (shared_buf_) {
-    RenderThread::current()->Send(
+    RenderThreadImpl::current()->Send(
         new ClipboardHostMsg_WriteObjectsSync(objects_,
                 shared_buf_->handle()));
     delete shared_buf_;
     return;
   }
 
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_WriteObjectsAsync(objects_));
 }
 
@@ -129,7 +129,7 @@ ui::Clipboard* ClipboardGetClipboard() {
 bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
                                 ui::Clipboard::Buffer buffer) {
   bool result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_IsFormatAvailable(format, buffer, &result));
   return result;
 }
@@ -137,23 +137,24 @@ bool ClipboardIsFormatAvailable(const ui::Clipboard::FormatType& format,
 void ClipboardReadAvailableTypes(ui::Clipboard::Buffer buffer,
                                  std::vector<string16>* types,
                                  bool* contains_filenames) {
-  RenderThread::current()->Send(new ClipboardHostMsg_ReadAvailableTypes(
+  RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadAvailableTypes(
       buffer, types, contains_filenames));
 }
 
 void ClipboardReadText(ui::Clipboard::Buffer buffer, string16* result) {
-  RenderThread::current()->Send(new ClipboardHostMsg_ReadText(buffer, result));
+  RenderThreadImpl::current()->Send(
+      new ClipboardHostMsg_ReadText(buffer, result));
 }
 
 void ClipboardReadAsciiText(ui::Clipboard::Buffer buffer, std::string* result) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadAsciiText(buffer, result));
 }
 
 void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
                        GURL* url, uint32* fragment_start,
                        uint32* fragment_end) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadHTML(buffer, markup, url, fragment_start,
                                     fragment_end));
 }
@@ -161,7 +162,7 @@ void ClipboardReadHTML(ui::Clipboard::Buffer buffer, string16* markup,
 void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
   base::SharedMemoryHandle image_handle;
   uint32 image_size;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_ReadImage(buffer, &image_handle, &image_size));
   if (base::SharedMemory::IsHandleValid(image_handle)) {
     base::SharedMemory buffer(image_handle, true);
@@ -173,7 +174,7 @@ void ClipboardReadImage(ui::Clipboard::Buffer buffer, std::string* data) {
 bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
                        string16* data, string16* metadata) {
   bool result = false;
-  RenderThread::current()->Send(new ClipboardHostMsg_ReadData(
+  RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadData(
       buffer, type, &result, data, metadata));
   return result;
 }
@@ -181,23 +182,24 @@ bool ClipboardReadData(ui::Clipboard::Buffer buffer, const string16& type,
 bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer,
                             std::vector<string16>* filenames) {
   bool result;
-  RenderThread::current()->Send(new ClipboardHostMsg_ReadFilenames(
+  RenderThreadImpl::current()->Send(new ClipboardHostMsg_ReadFilenames(
       buffer, &result, filenames));
   return result;
 }
 
 uint64 ClipboardGetSequenceNumber() {
   uint64 seq_num = 0;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ClipboardHostMsg_GetSequenceNumber(&seq_num));
   return seq_num;
 }
 
 void GetPlugins(bool refresh,
                 std::vector<webkit::WebPluginInfo>* plugins) {
-  if (!RenderThread::current()->plugin_refresh_allowed())
+  if (!RenderThreadImpl::current()->plugin_refresh_allowed())
     refresh = false;
-  RenderThread::current()->Send(new ViewHostMsg_GetPlugins(refresh, plugins));
+  RenderThreadImpl::current()->Send(
+      new ViewHostMsg_GetPlugins(refresh, plugins));
 }
 
 bool IsProtocolSupportedForMedia(const GURL& url) {
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 2c1937b..53db07f 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -23,7 +23,7 @@
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/renderer/render_process_impl.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "ui/base/ui_base_switches.h"
 
@@ -204,7 +204,7 @@ int RendererMain(const MainFunctionParams& parameters) {
     // TODO(markus): Check if it is OK to unconditionally move this
     // instruction down.
     RenderProcessImpl render_process;
-    render_process.set_main_thread(new RenderThread());
+    render_process.set_main_thread(new RenderThreadImpl());
 #endif
     bool run_loop = true;
     if (!no_sandbox) {
@@ -214,7 +214,7 @@ int RendererMain(const MainFunctionParams& parameters) {
     }
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
     RenderProcessImpl render_process;
-    render_process.set_main_thread(new RenderThread());
+    render_process.set_main_thread(new RenderThreadImpl());
 #endif
 
     platform.RunSandboxTests();
diff --git a/content/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc
index c7d8e27..76731f1 100644
--- a/content/renderer/renderer_webapplicationcachehost_impl.cc
+++ b/content/renderer/renderer_webapplicationcachehost_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ -38,14 +38,14 @@ void RendererWebApplicationCacheHostImpl::OnLogMessage(
 
 void RendererWebApplicationCacheHostImpl::OnContentBlocked(
     const GURL& manifest_url) {
-  RenderThread::current()->Send(new ViewHostMsg_AppCacheAccessed(
+  RenderThreadImpl::current()->Send(new ViewHostMsg_AppCacheAccessed(
       routing_id_, manifest_url, true));
 }
 
 void RendererWebApplicationCacheHostImpl::OnCacheSelected(
     const appcache::AppCacheInfo& info) {
   if (!info.manifest_url.is_empty()) {
-    RenderThread::current()->Send(new ViewHostMsg_AppCacheAccessed(
+    RenderThreadImpl::current()->Send(new ViewHostMsg_AppCacheAccessed(
         routing_id_, info.manifest_url, false));
   }
   WebApplicationCacheHostImpl::OnCacheSelected(info);
@@ -53,5 +53,5 @@ void RendererWebApplicationCacheHostImpl::OnCacheSelected(
 
 RenderView* RendererWebApplicationCacheHostImpl::GetRenderView() {
   return static_cast<RenderView*>
-      (RenderThread::current()->ResolveRoute(routing_id_));
+      (RenderThreadImpl::current()->ResolveRoute(routing_id_));
 }
diff --git a/content/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc
index 01ec6cf..1fbc435 100644
--- a/content/renderer/renderer_webcookiejar_impl.cc
+++ b/content/renderer/renderer_webcookiejar_impl.cc
@@ -7,7 +7,6 @@
 #include "base/utf_string_conversions.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
-#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCookie.h"
 #include "webkit/glue/webcookie.h"
diff --git a/content/renderer/renderer_webidbcursor_impl.cc b/content/renderer/renderer_webidbcursor_impl.cc
index 2e20cd5..4bf4ee1 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_impl.cc
@@ -6,7 +6,7 @@
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 
 using WebKit::WebExceptionCode;
 using WebKit::WebIDBCallbacks;
@@ -22,34 +22,34 @@ RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
   // object since inside WebKit, they hold a reference to the object wich owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
-  RenderThread::current()->Send(new IndexedDBHostMsg_CursorDestroyed(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_CursorDestroyed(
       idb_cursor_id_));
 }
 
 unsigned short RendererWebIDBCursorImpl::direction() const {
   int direction;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorDirection(idb_cursor_id_, &direction));
   return direction;
 }
 
 WebIDBKey RendererWebIDBCursorImpl::key() const {
   IndexedDBKey key;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorKey(idb_cursor_id_, &key));
   return key;
 }
 
 WebIDBKey RendererWebIDBCursorImpl::primaryKey() const {
   IndexedDBKey primaryKey;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorPrimaryKey(idb_cursor_id_, &primaryKey));
   return primaryKey;
 }
 
 WebSerializedScriptValue RendererWebIDBCursorImpl::value() const {
   SerializedScriptValue scriptValue;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_CursorValue(idb_cursor_id_, &scriptValue));
   return scriptValue;
 }
@@ -58,7 +58,7 @@ void RendererWebIDBCursorImpl::update(const WebSerializedScriptValue& value,
                                       WebIDBCallbacks* callbacks,
                                       WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorUpdate(SerializedScriptValue(value), callbacks,
                                      idb_cursor_id_, &ec);
 }
@@ -67,7 +67,7 @@ void RendererWebIDBCursorImpl::continueFunction(const WebIDBKey& key,
                                                 WebIDBCallbacks* callbacks,
                                                 WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorContinue(IndexedDBKey(key), callbacks,
                                        idb_cursor_id_, &ec);
 }
@@ -75,6 +75,6 @@ void RendererWebIDBCursorImpl::continueFunction(const WebIDBKey& key,
 void RendererWebIDBCursorImpl::deleteFunction(WebIDBCallbacks* callbacks,
                                               WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBCursorDelete(callbacks, idb_cursor_id_, &ec);
 }
diff --git a/content/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/renderer_webidbdatabase_impl.cc
index 4709165..7450b01 100644
--- a/content/renderer/renderer_webidbdatabase_impl.cc
+++ b/content/renderer/renderer_webidbdatabase_impl.cc
@@ -6,7 +6,7 @@
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbobjectstore_impl.h"
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
@@ -30,27 +30,27 @@ RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   // object since inside WebKit, they hold a reference to the object which owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
-  RenderThread::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
       idb_database_id_));
 }
 
 WebString RendererWebIDBDatabaseImpl::name() const {
   string16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseName(idb_database_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBDatabaseImpl::version() const {
   string16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseVersion(idb_database_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBDatabaseImpl::objectStoreNames() const {
   std::vector<string16> result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseObjectStoreNames(idb_database_id_, &result));
   WebDOMStringList webResult;
   for (std::vector<string16>::const_iterator it = result.begin();
@@ -74,7 +74,7 @@ WebKit::WebIDBObjectStore* RendererWebIDBDatabaseImpl::createObjectStore(
   params.idb_database_id = idb_database_id_;
 
   int object_store;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseCreateObjectStore(
           params, &object_store, &ec));
   if (!object_store)
@@ -86,7 +86,7 @@ void RendererWebIDBDatabaseImpl::deleteObjectStore(
     const WebString& name,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseDeleteObjectStore(
           idb_database_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
@@ -97,7 +97,7 @@ void RendererWebIDBDatabaseImpl::setVersion(
     WebIDBCallbacks* callbacks,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBDatabaseSetVersion(
       version, callbacks, idb_database_id_, &ec);
 }
@@ -112,7 +112,7 @@ WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
     object_stores.push_back(names.item(i));
 
   int transaction_id;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_DatabaseTransaction(
           idb_database_id_, object_stores, mode,
           &transaction_id, &ec));
@@ -123,12 +123,12 @@ WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
 
 void RendererWebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBDatabaseClose(idb_database_id_);
 }
 
 void RendererWebIDBDatabaseImpl::open(WebIDBDatabaseCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBDatabaseOpen(callbacks, idb_database_id_);
 }
diff --git a/content/renderer/renderer_webidbfactory_impl.cc b/content/renderer/renderer_webidbfactory_impl.cc
index f52be45..80b2508 100644
--- a/content/renderer/renderer_webidbfactory_impl.cc
+++ b/content/renderer/renderer_webidbfactory_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/renderer_webidbfactory_impl.h"
 
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/indexed_db_dispatcher.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
@@ -30,7 +30,7 @@ void RendererWebIDBFactoryImpl::getDatabaseNames(
     unsigned long long maximum_size_unused,
     WebKit::WebIDBFactory::BackingStoreType) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBFactoryGetDatabaseNames(
       callbacks, origin.databaseIdentifier(), web_frame);
 }
@@ -46,7 +46,7 @@ void RendererWebIDBFactoryImpl::open(
   // Don't send the data_dir. We know what we want on the Browser side of
   // things.
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBFactoryOpen(
       name, callbacks, origin.databaseIdentifier(), web_frame);
 }
@@ -71,7 +71,7 @@ void RendererWebIDBFactoryImpl::deleteDatabase(
   // Don't send the data_dir. We know what we want on the Browser side of
   // things.
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBFactoryDeleteDatabase(
       name, callbacks, origin.databaseIdentifier(), web_frame);
 }
diff --git a/content/renderer/renderer_webidbindex_impl.cc b/content/renderer/renderer_webidbindex_impl.cc
index 10aaf18..4fb5866 100644
--- a/content/renderer/renderer_webidbindex_impl.cc
+++ b/content/renderer/renderer_webidbindex_impl.cc
@@ -6,7 +6,7 @@
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
@@ -25,34 +25,34 @@ RendererWebIDBIndexImpl::~RendererWebIDBIndexImpl() {
   // object since inside WebKit, they hold a reference to the object wich owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
-  RenderThread::current()->Send(new IndexedDBHostMsg_IndexDestroyed(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_IndexDestroyed(
       idb_index_id_));
 }
 
 WebString RendererWebIDBIndexImpl::name() const {
   string16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexName(idb_index_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBIndexImpl::storeName() const {
   string16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexStoreName(idb_index_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBIndexImpl::keyPath() const {
   NullableString16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexKeyPath(idb_index_id_, &result));
   return result;
 }
 
 bool RendererWebIDBIndexImpl::unique() const {
   bool result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_IndexUnique(idb_index_id_, &result));
   return result;
 }
@@ -64,7 +64,7 @@ void RendererWebIDBIndexImpl::openObjectCursor(
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBIndexOpenObjectCursor(
       range, direction, callbacks,  idb_index_id_, transaction, &ec);
 }
@@ -76,7 +76,7 @@ void RendererWebIDBIndexImpl::openKeyCursor(
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBIndexOpenKeyCursor(
       range, direction, callbacks,  idb_index_id_, transaction, &ec);
 }
@@ -87,7 +87,7 @@ void RendererWebIDBIndexImpl::getObject(
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBIndexGetObject(
       IndexedDBKey(key), callbacks, idb_index_id_, transaction, &ec);
 }
@@ -98,7 +98,7 @@ void RendererWebIDBIndexImpl::getKey(
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBIndexGetKey(
       IndexedDBKey(key), callbacks, idb_index_id_, transaction, &ec);
 }
diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc
index 2b6190f..8f65bf4 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/renderer_webidbobjectstore_impl.cc
@@ -7,7 +7,7 @@
 #include "content/common/indexed_db_messages.h"
 #include "content/common/serialized_script_value.h"
 #include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbindex_impl.h"
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
@@ -38,27 +38,27 @@ RendererWebIDBObjectStoreImpl::~RendererWebIDBObjectStoreImpl() {
   // object since inside WebKit, they hold a reference to the object wich owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreDestroyed(idb_object_store_id_));
 }
 
 WebString RendererWebIDBObjectStoreImpl::name() const {
   string16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreName(idb_object_store_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBObjectStoreImpl::keyPath() const {
   NullableString16 result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
   std::vector<string16> result;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreIndexNames(
           idb_object_store_id_, &result));
   WebDOMStringList web_result;
@@ -75,7 +75,7 @@ void RendererWebIDBObjectStoreImpl::get(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStoreGet(
       IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
 }
@@ -88,7 +88,7 @@ void RendererWebIDBObjectStoreImpl::put(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStorePut(
       SerializedScriptValue(value), IndexedDBKey(key), put_mode, callbacks,
       idb_object_store_id_, transaction, &ec);
@@ -100,7 +100,7 @@ void RendererWebIDBObjectStoreImpl::deleteFunction(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStoreDelete(
       IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
 }
@@ -110,7 +110,7 @@ void RendererWebIDBObjectStoreImpl::clear(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStoreClear(
       callbacks, idb_object_store_id_, transaction, &ec);
 }
@@ -129,7 +129,7 @@ WebIDBIndex* RendererWebIDBObjectStoreImpl::createIndex(
   params.idb_object_store_id = idb_object_store_id_;
 
   int32 index_id;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreCreateIndex(params, &index_id, &ec));
   if (!index_id)
     return NULL;
@@ -140,7 +140,7 @@ WebIDBIndex* RendererWebIDBObjectStoreImpl::index(
     const WebString& name,
     WebExceptionCode& ec) {
   int32 idb_index_id;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreIndex(idb_object_store_id_, name,
                                             &idb_index_id, &ec));
   if (!idb_index_id)
@@ -152,7 +152,7 @@ void RendererWebIDBObjectStoreImpl::deleteIndex(
     const WebString& name,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_ObjectStoreDeleteIndex(
           idb_object_store_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
@@ -164,7 +164,7 @@ void RendererWebIDBObjectStoreImpl::openCursor(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStoreOpenCursor(
       idb_key_range, direction, callbacks,  idb_object_store_id_,
       transaction, &ec);
diff --git a/content/renderer/renderer_webidbtransaction_impl.cc b/content/renderer/renderer_webidbtransaction_impl.cc
index d09846d..78a7de8 100644
--- a/content/renderer/renderer_webidbtransaction_impl.cc
+++ b/content/renderer/renderer_webidbtransaction_impl.cc
@@ -6,7 +6,7 @@
 
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/renderer_webidbobjectstore_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
@@ -26,14 +26,14 @@ RendererWebIDBTransactionImpl::~RendererWebIDBTransactionImpl() {
   // object since inside WebKit, they hold a reference to the object wich owns
   // this object. But, if that ever changed, then we'd need to invalidate
   // any such pointers.
-  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionDestroyed(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_TransactionDestroyed(
       idb_transaction_id_));
 }
 
 int RendererWebIDBTransactionImpl::mode() const
 {
   int mode;
-  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionMode(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_TransactionMode(
       idb_transaction_id_, &mode));
   return mode;
 }
@@ -43,7 +43,7 @@ WebIDBObjectStore* RendererWebIDBTransactionImpl::objectStore(
     WebKit::WebExceptionCode& ec)
 {
   int object_store_id;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_TransactionObjectStore(
           idb_transaction_id_, name, &object_store_id, &ec));
   if (!object_store_id)
@@ -53,13 +53,13 @@ WebIDBObjectStore* RendererWebIDBTransactionImpl::objectStore(
 
 void RendererWebIDBTransactionImpl::abort()
 {
-  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionAbort(
+  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_TransactionAbort(
       idb_transaction_id_));
 }
 
 void RendererWebIDBTransactionImpl::didCompleteTaskEvents()
 {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new IndexedDBHostMsg_TransactionDidCompleteTaskEvents(
           idb_transaction_id_));
 }
@@ -68,7 +68,7 @@ void RendererWebIDBTransactionImpl::setCallbacks(
     WebIDBTransactionCallbacks* callbacks)
 {
   IndexedDBDispatcher* dispatcher =
-      RenderThread::current()->indexed_db_dispatcher();
+      RenderThreadImpl::current()->indexed_db_dispatcher();
   dispatcher->RegisterWebIDBTransactionCallbacks(callbacks,
                                                  idb_transaction_id_);
 }
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 24863e4..e0198ec 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -22,7 +22,7 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/media/audio_device.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_webaudiodevice_impl.h"
 #include "content/renderer/renderer_webidbfactory_impl.h"
@@ -192,7 +192,7 @@ bool RendererWebKitPlatformSupportImpl::sandboxEnabled() {
 
 bool RendererWebKitPlatformSupportImpl::SendSyncMessageFromAnyThread(
     IPC::SyncMessage* msg) {
-  RenderThread* render_thread = RenderThread::current();
+  RenderThreadImpl* render_thread = RenderThreadImpl::current();
   if (render_thread)
     return render_thread->Send(msg);
 
@@ -253,12 +253,12 @@ void RendererWebKitPlatformSupportImpl::cacheMetadata(
   // browser may cache it and return it on subsequent responses to speed
   // the processing of this resource.
   std::vector<char> copy(data, data + size);
-  RenderThread::current()->Send(new ViewHostMsg_DidGenerateCacheableMetadata(
-      url, response_time, copy));
+  RenderThreadImpl::current()->Send(
+      new ViewHostMsg_DidGenerateCacheableMetadata(url, response_time, copy));
 }
 
 WebString RendererWebKitPlatformSupportImpl::defaultLocale() {
-  return ASCIIToUTF16(RenderThread::Get()->GetLocale());
+  return ASCIIToUTF16(RenderThreadImpl::Get()->GetLocale());
 }
 
 void RendererWebKitPlatformSupportImpl::suddenTerminationChanged(bool enabled) {
@@ -276,7 +276,7 @@ void RendererWebKitPlatformSupportImpl::suddenTerminationChanged(bool enabled) {
       return;
   }
 
-  RenderThread* thread = RenderThread::current();
+  RenderThreadImpl* thread = RenderThreadImpl::current();
   if (thread)  // NULL in unittests.
     thread->Send(new ViewHostMsg_SuddenTerminationChanged(enabled));
 }
@@ -355,7 +355,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeForExtension(
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   std::string mime_type;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new MimeRegistryMsg_GetMimeTypeFromExtension(
           webkit_glue::WebStringToFilePathString(file_extension), &mime_type));
   return ASCIIToUTF16(mime_type);
@@ -370,7 +370,7 @@ WebString RendererWebKitPlatformSupportImpl::MimeRegistry::mimeTypeFromFile(
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   std::string mime_type;
-  RenderThread::current()->Send(new MimeRegistryMsg_GetMimeTypeFromFile(
+  RenderThreadImpl::current()->Send(new MimeRegistryMsg_GetMimeTypeFromFile(
       FilePath(webkit_glue::WebStringToFilePathString(file_path)),
       &mime_type));
   return ASCIIToUTF16(mime_type);
@@ -386,7 +386,7 @@ RendererWebKitPlatformSupportImpl::MimeRegistry::preferredExtensionForMIMEType(
   // The sandbox restricts our access to the registry, so we need to proxy
   // these calls over to the browser process.
   FilePath::StringType file_extension;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new MimeRegistryMsg_GetPreferredExtensionForMimeType(
           UTF16ToASCII(mime_type), &file_extension));
   return webkit_glue::FilePathStringToWebString(file_extension);
@@ -410,7 +410,8 @@ void RendererWebKitPlatformSupportImpl::FileUtilities::revealFolderInOS(
     const WebString& path) {
   FilePath file_path(webkit_glue::WebStringToFilePath(path));
   file_util::AbsolutePath(&file_path);
-  RenderThread::current()->Send(new ViewHostMsg_RevealFolderInOS(file_path));
+  RenderThreadImpl::current()->Send(
+      new ViewHostMsg_RevealFolderInOS(file_path));
 }
 
 bool RendererWebKitPlatformSupportImpl::FileUtilities::getFileModificationTime(
@@ -444,7 +445,7 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::ensureFontLoaded(
     HFONT font) {
   LOGFONT logfont;
   GetObject(font, sizeof(LOGFONT), &logfont);
-  RenderThread::current()->PreCacheFont(logfont);
+  RenderThreadImpl::current()->PreCacheFont(logfont);
   return true;
 }
 
@@ -455,7 +456,7 @@ bool RendererWebKitPlatformSupportImpl::SandboxSupport::loadFont(
   uint32 font_data_size;
   FontDescriptor src_font_descriptor(src_font);
   base::SharedMemoryHandle font_data;
-  if (!RenderThread::current()->Send(new ViewHostMsg_LoadFont(
+  if (!RenderThreadImpl::current()->Send(new ViewHostMsg_LoadFont(
         src_font_descriptor, &font_data_size, &font_data, font_id))) {
     *out = NULL;
     *font_id = 0;
@@ -592,7 +593,7 @@ RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
     const WebKit::WebString& challenge,
     const WebKit::WebURL& url) {
   std::string signed_public_key;
-  RenderThread::current()->Send(new ViewHostMsg_Keygen(
+  RenderThreadImpl::current()->Send(new ViewHostMsg_Keygen(
       static_cast<uint32>(key_size_index),
       challenge.utf8(),
       GURL(url),
@@ -603,9 +604,9 @@ RendererWebKitPlatformSupportImpl::signedPublicKeyAndChallengeString(
 //------------------------------------------------------------------------------
 
 WebBlobRegistry* RendererWebKitPlatformSupportImpl::blobRegistry() {
-  // RenderThread::current can be NULL when running some tests.
-  if (!blob_registry_.get() && RenderThread::current()) {
-    blob_registry_.reset(new WebBlobRegistryImpl(RenderThread::Get()));
+  // RenderThreadImpl::current can be NULL when running some tests.
+  if (!blob_registry_.get() && RenderThreadImpl::current()) {
+    blob_registry_.reset(new WebBlobRegistryImpl(RenderThreadImpl::Get()));
   }
   return blob_registry_.get();
 }
diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc
index c7ed9a9..5ee9c68 100644
--- a/content/renderer/renderer_webstoragearea_impl.cc
+++ b/content/renderer/renderer_webstoragearea_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/renderer_webstoragearea_impl.h"
 
 #include "content/common/dom_storage_messages.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
@@ -16,7 +16,7 @@ using WebKit::WebURL;
 
 RendererWebStorageAreaImpl::RendererWebStorageAreaImpl(
     int64 namespace_id, const WebString& origin) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_StorageAreaId(namespace_id, origin,
                                           &storage_area_id_));
 }
@@ -26,21 +26,21 @@ RendererWebStorageAreaImpl::~RendererWebStorageAreaImpl() {
 
 unsigned RendererWebStorageAreaImpl::length() {
   unsigned length;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_Length(storage_area_id_, &length));
   return length;
 }
 
 WebString RendererWebStorageAreaImpl::key(unsigned index) {
   NullableString16 key;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_Key(storage_area_id_, index, &key));
   return key;
 }
 
 WebString RendererWebStorageAreaImpl::getItem(const WebString& key) {
   NullableString16 value;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_GetItem(storage_area_id_, key, &value));
   return value;
 }
@@ -54,7 +54,7 @@ void RendererWebStorageAreaImpl::setItem(
     return;
   }
   NullableString16 old_value;
-  RenderThread::current()->Send(new DOMStorageHostMsg_SetItem(
+  RenderThreadImpl::current()->Send(new DOMStorageHostMsg_SetItem(
       storage_area_id_, key, value, url, &result, &old_value));
   old_value_webkit = old_value;
 }
@@ -62,13 +62,13 @@ void RendererWebStorageAreaImpl::setItem(
 void RendererWebStorageAreaImpl::removeItem(
     const WebString& key, const WebURL& url, WebString& old_value_webkit) {
   NullableString16 old_value;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_RemoveItem(storage_area_id_, key, url, &old_value));
   old_value_webkit = old_value;
 }
 
 void RendererWebStorageAreaImpl::clear(
     const WebURL& url, bool& cleared_something) {
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new DOMStorageHostMsg_Clear(storage_area_id_, url, &cleared_something));
 }
diff --git a/content/renderer/renderer_webstoragenamespace_impl.cc b/content/renderer/renderer_webstoragenamespace_impl.cc
index 25278be..a56e565 100644
--- a/content/renderer/renderer_webstoragenamespace_impl.cc
+++ b/content/renderer/renderer_webstoragenamespace_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/renderer_webstoragenamespace_impl.h"
 
-#include "content/renderer/render_thread.h"
+#include "base/logging.h"
 #include "content/renderer/renderer_webstoragearea_impl.h"
 
 using WebKit::WebStorageArea;
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 121f5a3..88fb6af 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -31,7 +31,7 @@
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/gpu/command_buffer_proxy.h"
 #include "content/renderer/plugin_channel_host.h"
-#include "content/renderer/render_thread.h"
+#include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/mime_util.h"
@@ -285,7 +285,7 @@ bool WebPluginDelegateProxy::Initialize(
     webkit::npapi::WebPlugin* plugin,
     bool load_manually) {
   IPC::ChannelHandle channel_handle;
-  if (!RenderThread::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
+  if (!RenderThreadImpl::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
           render_view_->routing_id(), url, page_url_, mime_type_,
           &channel_handle, &info_))) {
     return false;
@@ -652,7 +652,7 @@ bool WebPluginDelegateProxy::CreateSharedBitmap(
 #if defined(OS_MACOSX)
   TransportDIB::Handle handle;
   IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, false, &handle);
-  if (!RenderThread::current()->Send(msg))
+  if (!RenderThreadImpl::current()->Send(msg))
     return false;
   if (handle.fd < 0)
     return false;
@@ -1148,7 +1148,7 @@ void WebPluginDelegateProxy::OnResolveProxy(const GURL& url,
                                             bool* result,
                                             std::string* proxy_list) {
   *result = false;
-  RenderThread::current()->Send(
+  RenderThreadImpl::current()->Send(
       new ViewHostMsg_ResolveProxy(url, result, proxy_list));
 }
 
diff --git a/content/renderer/websharedworkerrepository_impl.cc b/content/renderer/websharedworkerrepository_impl.cc
index 6269fa0..cae24a4 100644
--- a/content/renderer/websharedworkerrepository_impl.cc
+++ b/content/renderer/websharedworkerrepository_impl.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/websharedworkerrepository_impl.h"
 
+#include "content/common/child_thread.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/render_thread.h"
 #include "content/renderer/websharedworker_proxy.h"
 
 WebSharedWorkerRepositoryImpl::WebSharedWorkerRepositoryImpl() {}