Move RenderThread to content\renderer.

TBR=avi
Review URL: http://codereview.chromium.org/6861005

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

51 files changed, 58 insertions, 58 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index c00fc7b..fb1b699 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -59,7 +59,6 @@
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/renderer/render_process_impl.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/browser/appcache/appcache_dispatcher_host.h"
 #include "content/browser/browser_child_process_host.h"
 #include "content/browser/child_process_security_policy.h"
@@ -100,6 +99,7 @@
 #include "content/common/resource_messages.h"
 #include "content/common/result_codes.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 5bcb197..863b271 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -123,8 +123,6 @@
         'renderer/render_process.h',
         'renderer/render_process_impl.cc',
         'renderer/render_process_impl.h',
-        'renderer/render_thread.cc',
-        'renderer/render_thread.h',
         'renderer/renderer_glue.cc',
         'renderer/renderer_histogram_snapshots.cc',
         'renderer/renderer_histogram_snapshots.h',
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 47d633c..d677e5f 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -41,7 +41,6 @@
 #include "chrome/renderer/page_click_tracker.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/print_web_view_helper.h"
-#include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
@@ -55,6 +54,7 @@
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/resource_dispatcher.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index 142e96f..46b1a8f 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -8,7 +8,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/devtools_messages.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.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"
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index f5408d6..7361d392 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -14,7 +14,7 @@
 #include "chrome/renderer/extensions/extension_dispatcher.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
 #include "grit/renderer_resources.h"
diff --git a/chrome/renderer/extensions/extension_dispatcher.cc b/chrome/renderer/extensions/extension_dispatcher.cc
index fe30498..5da13d4 100644
--- a/chrome/renderer/extensions/extension_dispatcher.cc
+++ b/chrome/renderer/extensions/extension_dispatcher.cc
@@ -16,7 +16,7 @@
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "v8/include/v8.h"
 
 namespace {
diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc
index 5ed21f3..246f6ad 100644
--- a/chrome/renderer/extensions/extension_process_bindings.cc
+++ b/chrome/renderer/extensions/extension_process_bindings.cc
@@ -28,7 +28,7 @@
 #include "chrome/renderer/extensions/js_only_v8_extensions.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/extensions/user_script_slave.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/render_view_visitor.h"
 #include "grit/common_resources.h"
diff --git a/chrome/renderer/extensions/renderer_extension_bindings.cc b/chrome/renderer/extensions/renderer_extension_bindings.cc
index 1a5cc2e..d9507b5 100644
--- a/chrome/renderer/extensions/renderer_extension_bindings.cc
+++ b/chrome/renderer/extensions/renderer_extension_bindings.cc
@@ -15,7 +15,7 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "grit/renderer_resources.h"
 
diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
index f0c7a13..fa926d1 100644
--- a/chrome/renderer/extensions/user_script_slave.cc
+++ b/chrome/renderer/extensions/user_script_slave.cc
@@ -17,7 +17,7 @@
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/extension_groups.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "googleurl/src/gurl.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index 1d04b97..c1a77dd 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -10,7 +10,7 @@
 
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/renderer/mock_printer.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "ipc/ipc_test_sink.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 
diff --git a/chrome/renderer/net/renderer_net_predictor.cc b/chrome/renderer/net/renderer_net_predictor.cc
index b32608a..65fcbe2 100644
--- a/chrome/renderer/net/renderer_net_predictor.cc
+++ b/chrome/renderer/net/renderer_net_predictor.cc
@@ -14,7 +14,7 @@
 #include "chrome/common/net/predictor_common.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/net/predictor_queue.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 
 // The number of hostnames submitted to Browser DNS resolver per call to
 // SubmitHostsnames() (which reads names from our queue).
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 922f5c0..deb67b1 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -25,8 +25,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/view_messages.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/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 8481945..47e2304 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -21,11 +21,11 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/common/view_messages.h"
 #include "content/plugin/npobject_util.h"
+#include "content/renderer/render_thread.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/WebKitClient.h"
diff --git a/chrome/renderer/renderer_histogram_snapshots.cc b/chrome/renderer/renderer_histogram_snapshots.cc
index f8a7794..3eed2d2 100644
--- a/chrome/renderer/renderer_histogram_snapshots.cc
+++ b/chrome/renderer/renderer_histogram_snapshots.cc
@@ -11,7 +11,7 @@
 #include "base/metrics/histogram.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 
 // TODO(raman): Before renderer shuts down send final snapshot lists.
 
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index c72fe20..8d4e51c 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -29,9 +29,9 @@
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "chrome/renderer/render_process_impl.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/main_function_params.h"
 #include "content/common/hi_res_timer_manager.h"
+#include "content/renderer/render_thread.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_module.h"
 #include "ui/base/system_monitor/system_monitor.h"
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
index efd5d8a..43bba8d 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate.cc
@@ -13,11 +13,11 @@
 #include "base/memory/scoped_callback_factory.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
-#include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
 #include "chrome/renderer/safe_browsing/scorer.h"
 #include "content/renderer/navigation_state.h"
+#include "content/renderer/render_thread.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/WebURL.h"
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
index 6b890f7..8e1333c 100644
--- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
+++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
@@ -11,7 +11,6 @@
 #include "base/shared_memory.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/mock_render_process.h"
-#include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "content/common/dom_storage_common.h"
 #include "content/common/main_function_params.h"
@@ -19,6 +18,7 @@
 #include "content/common/resource_response.h"
 #include "content/common/sandbox_init_wrapper.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc
index ca14cbb..8b31afb 100644
--- a/chrome/renderer/spellchecker/spellcheck.cc
+++ b/chrome/renderer/spellchecker/spellcheck.cc
@@ -11,7 +11,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/spellcheck_common.h"
 #include "chrome/common/spellcheck_messages.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "third_party/hunspell/src/hunspell/hunspell.hxx"
 
 using base::TimeTicks;
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 09c5ad1..44a84ff 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -87,6 +87,8 @@
         'renderer/plugin_channel_host.h',
         'renderer/render_process_observer.cc',
         'renderer/render_process_observer.h',
+        'renderer/render_thread.cc',
+        'renderer/render_thread.h',
         'renderer/render_view.cc',
         'renderer/render_view.h',
         'renderer/render_view_linux.cc',
@@ -130,10 +132,10 @@
         'renderer/renderer_webstoragenamespace_impl.h',
         'renderer/speech_input_dispatcher.cc',
         'renderer/speech_input_dispatcher.h',
-	'renderer/transport_texture_host.cc',
-	'renderer/transport_texture_host.h',
-	'renderer/transport_texture_service.cc',
-	'renderer/transport_texture_service.h',
+        'renderer/transport_texture_host.cc',
+        'renderer/transport_texture_host.h',
+        'renderer/transport_texture_service.cc',
+        'renderer/transport_texture_service.h',
         'renderer/video_decode_accelerator_host.cc',
         'renderer/video_decode_accelerator_host.h',
         'renderer/webgraphicscontext3d_command_buffer_impl.cc',
diff --git a/content/renderer/audio_device.cc b/content/renderer/audio_device.cc
index 4813e07..1940f20 100644
--- a/content/renderer/audio_device.cc
+++ b/content/renderer/audio_device.cc
@@ -6,10 +6,10 @@
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/audio_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "media/audio/audio_util.h"
 
 scoped_refptr<AudioMessageFilter> AudioDevice::filter_;
diff --git a/content/renderer/audio_input_device.cc b/content/renderer/audio_input_device.cc
index f1e7815..2b565e9 100644
--- a/content/renderer/audio_input_device.cc
+++ b/content/renderer/audio_input_device.cc
@@ -6,10 +6,10 @@
 
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/audio_messages.h"
 #include "content/common/child_process.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "media/audio/audio_util.h"
 
 scoped_refptr<AudioInputMessageFilter> AudioInputDevice::filter_;
diff --git a/content/renderer/command_buffer_proxy.cc b/content/renderer/command_buffer_proxy.cc
index e374386..e4d3734 100644
--- a/content/renderer/command_buffer_proxy.cc
+++ b/content/renderer/command_buffer_proxy.cc
@@ -8,11 +8,11 @@
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.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_channel_host.cc b/content/renderer/gpu_channel_host.cc
index 89d39bf..7630462 100644
--- a/content/renderer/gpu_channel_host.cc
+++ b/content/renderer/gpu_channel_host.cc
@@ -4,11 +4,11 @@
 
 #include "content/renderer/gpu_channel_host.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/child_process.h"
 #include "content/common/gpu_messages.h"
 #include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/gpu_video_service_host.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/transport_texture_service.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/content/renderer/gpu_video_service_host.cc b/content/renderer/gpu_video_service_host.cc
index cb12ae3..c1ed5db 100644
--- a/content/renderer/gpu_video_service_host.cc
+++ b/content/renderer/gpu_video_service_host.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/gpu_video_service_host.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/renderer/gpu_video_decoder_host.h"
 #include "content/common/gpu_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/video_decode_accelerator_host.h"
 #include "media/video/video_decode_accelerator.h"
 
diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc
index 7572bdf..06c2be0 100644
--- a/content/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db_dispatcher.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/indexed_db_dispatcher.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_webidbcursor_impl.h"
 #include "content/renderer/renderer_webidbdatabase_impl.h"
diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc
index e4730cb..87228d3 100644
--- a/content/renderer/media/audio_renderer_impl.cc
+++ b/content/renderer/media/audio_renderer_impl.cc
@@ -6,8 +6,8 @@
 
 #include <math.h>
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/audio_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "media/base/filter_host.h"
 
diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index 0385e70..d1aecba 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -8,9 +8,9 @@
 #include "base/task.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.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 5ce3bd9..fb56bb3 100644
--- a/content/renderer/pepper_platform_context_3d_impl.cc
+++ b/content/renderer/pepper_platform_context_3d_impl.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/pepper_platform_context_3d_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/renderer/command_buffer_proxy.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/renderer_gl_context.h"
 #include "content/renderer/gpu_channel_host.h"
 #include "googleurl/src/gurl.h"
diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 209351d..fda4d02 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -16,7 +16,6 @@
 #include "base/time.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/audio_messages.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
@@ -31,6 +30,7 @@
 #include "content/renderer/gpu_channel_host.h"
 #include "content/renderer/p2p/p2p_transport_impl.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
diff --git a/chrome/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 16ad7d5..794f1e2 100644
--- a/chrome/renderer/render_thread.cc
+++ b/content/renderer/render_thread.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 "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 
 #include <algorithm>
 #include <limits>
diff --git a/chrome/renderer/render_thread.h b/content/renderer/render_thread.h
index 3b963dc..d3cb4b3 100644
--- a/chrome/renderer/render_thread.h
+++ b/content/renderer/render_thread.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 CHROME_RENDERER_RENDER_THREAD_H_
-#define CHROME_RENDERER_RENDER_THREAD_H_
+#ifndef CONTENT_RENDERER_RENDER_THREAD_H_
+#define CONTENT_RENDERER_RENDER_THREAD_H_
 #pragma once
 
 #include <set>
@@ -326,4 +326,4 @@ class RenderThread : public RenderThreadBase,
   DISALLOW_COPY_AND_ASSIGN(RenderThread);
 };
 
-#endif  // CHROME_RENDERER_RENDER_THREAD_H_
+#endif  // CONTENT_RENDERER_RENDER_THREAD_H_
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index f659173..8adbd10 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -39,7 +39,6 @@
 #include "chrome/renderer/external_host_bindings.h"
 #include "chrome/renderer/localized_error.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/searchbox.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/appcache/appcache_dispatcher.h"
@@ -66,6 +65,7 @@
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view_observer.h"
 #include "content/renderer/render_view_visitor.h"
 #include "content/renderer/render_widget_fullscreen_pepper.h"
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 3f3fc75..2ebb16e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -13,8 +13,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/renderer_webkitclient_impl.h"
 #include "gpu/common/gpu_trace_event.h"
 #include "ipc/ipc_sync_message.h"
diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc
index e32c4d9..c5e1b29 100644
--- a/content/renderer/render_widget_fullscreen.cc
+++ b/content/renderer/render_widget_fullscreen.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/render_widget_fullscreen.h"
 
-#include "chrome/renderer/render_thread.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 b4624bd..d3e2e20 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -5,11 +5,11 @@
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 
 #include "base/message_loop.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/common/view_messages.h"
 #include "content/renderer/renderer_gl_context.h"
 #include "content/renderer/gpu_channel_host.h"
 #include "content/renderer/pepper_platform_context_3d_impl.h"
-#include "content/common/view_messages.h"
+#include "content/renderer/render_thread.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"
diff --git a/content/renderer/render_widget_unittest.cc b/content/renderer/render_widget_unittest.cc
index 88983dd..0998c6a 100644
--- a/content/renderer/render_widget_unittest.cc
+++ b/content/renderer/render_widget_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/mock_render_thread.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_widget.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 
diff --git a/content/renderer/renderer_gl_context.cc b/content/renderer/renderer_gl_context.cc
index e55357d..f913a3b 100644
--- a/content/renderer/renderer_gl_context.cc
+++ b/content/renderer/renderer_gl_context.cc
@@ -10,12 +10,12 @@
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/shared_memory.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/gpu_channel_host.h"
 #include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/media/gles2_video_decode_context.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_widget.h"
 #include "content/renderer/transport_texture_host.h"
 #include "content/renderer/transport_texture_service.h"
diff --git a/content/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc
index c22d4e3..52ce5e0 100644
--- a/content/renderer/renderer_webapplicationcachehost_impl.cc
+++ b/content/renderer/renderer_webapplicationcachehost_impl.cc
@@ -5,8 +5,8 @@
 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
 
 #include "chrome/common/content_settings_types.h"
-#include "chrome/renderer/render_thread.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/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
diff --git a/content/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc
index 3bbb551..1fd573b 100644
--- a/content/renderer/renderer_webcookiejar_impl.cc
+++ b/content/renderer/renderer_webcookiejar_impl.cc
@@ -6,7 +6,7 @@
 
 #include "base/utf_string_conversions.h"
 #include "content/common/view_messages.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.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 1bad237..21332e1 100644
--- a/content/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_impl.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/renderer_webidbcursor_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/render_thread.h"
 
 using WebKit::WebExceptionCode;
 using WebKit::WebIDBCallbacks;
diff --git a/content/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/renderer_webidbdatabase_impl.cc
index da99ed7..1b0aed5 100644
--- a/content/renderer/renderer_webidbdatabase_impl.cc
+++ b/content/renderer/renderer_webidbdatabase_impl.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/renderer_webidbdatabase_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/render_thread.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"
diff --git a/content/renderer/renderer_webidbfactory_impl.cc b/content/renderer/renderer_webidbfactory_impl.cc
index a8de8e3..87b11b5 100644
--- a/content/renderer/renderer_webidbfactory_impl.cc
+++ b/content/renderer/renderer_webidbfactory_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/renderer_webidbfactory_impl.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.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"
diff --git a/content/renderer/renderer_webidbindex_impl.cc b/content/renderer/renderer_webidbindex_impl.cc
index 72c0e84..10aaf18 100644
--- a/content/renderer/renderer_webidbindex_impl.cc
+++ b/content/renderer/renderer_webidbindex_impl.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/renderer_webidbindex_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/render_thread.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"
diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc
index af23fe5..2b6190f 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/renderer_webidbobjectstore_impl.cc
@@ -4,10 +4,10 @@
 
 #include "content/renderer/renderer_webidbobjectstore_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #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/renderer_webidbindex_impl.h"
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
diff --git a/content/renderer/renderer_webidbtransaction_impl.cc b/content/renderer/renderer_webidbtransaction_impl.cc
index 15a08d4..d09846d 100644
--- a/content/renderer/renderer_webidbtransaction_impl.cc
+++ b/content/renderer/renderer_webidbtransaction_impl.cc
@@ -4,9 +4,9 @@
 
 #include "content/renderer/renderer_webidbtransaction_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.h"
+#include "content/renderer/render_thread.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"
diff --git a/content/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc
index 46f189f..3890d39 100644
--- a/content/renderer/renderer_webkitclient_impl.cc
+++ b/content/renderer/renderer_webkitclient_impl.cc
@@ -13,7 +13,6 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
-#include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/database_util.h"
 #include "content/common/file_system/webfilesystem_impl.h"
@@ -24,6 +23,7 @@
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/plugin/npobject_util.h"
 #include "content/renderer/content_renderer_client.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "content/renderer/renderer_webaudiodevice_impl.h"
 #include "content/renderer/renderer_webidbfactory_impl.h"
diff --git a/content/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc
index fc49eca..6ff0a70 100644
--- a/content/renderer/renderer_webstoragearea_impl.cc
+++ b/content/renderer/renderer_webstoragearea_impl.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/renderer_webstoragearea_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/dom_storage_messages.h"
+#include "content/renderer/render_thread.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/WebURL.h"
diff --git a/content/renderer/renderer_webstoragenamespace_impl.cc b/content/renderer/renderer_webstoragenamespace_impl.cc
index 5edfa39..f2d718b 100644
--- a/content/renderer/renderer_webstoragenamespace_impl.cc
+++ b/content/renderer/renderer_webstoragenamespace_impl.cc
@@ -5,7 +5,7 @@
 #include "content/renderer/renderer_webstoragenamespace_impl.h"
 
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/renderer_webstoragearea_impl.h"
 
 using WebKit::WebStorageArea;
diff --git a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc
index 39e7919..7915203 100644
--- a/content/renderer/webgraphicscontext3d_command_buffer_impl.cc
+++ b/content/renderer/webgraphicscontext3d_command_buffer_impl.cc
@@ -19,8 +19,8 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/renderer/gpu_channel_host.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 01ed651..07f3cae 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -22,7 +22,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/render_thread.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
 #include "content/plugin/npobject_proxy.h"
@@ -31,6 +30,7 @@
 #include "content/renderer/command_buffer_proxy.h"
 #include "content/renderer/content_renderer_client.h"
 #include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/render_view.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/mime_util.h"
diff --git a/content/renderer/websharedworkerrepository_impl.cc b/content/renderer/websharedworkerrepository_impl.cc
index d0f9566..6269fa0 100644
--- a/content/renderer/websharedworkerrepository_impl.cc
+++ b/content/renderer/websharedworkerrepository_impl.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/websharedworkerrepository_impl.h"
 
-#include "chrome/renderer/render_thread.h"
 #include "content/common/view_messages.h"
+#include "content/renderer/render_thread.h"
 #include "content/renderer/websharedworker_proxy.h"
 
 WebSharedWorkerRepositoryImpl::WebSharedWorkerRepositoryImpl() {}