42 files changed, 112 insertions, 111 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 11c572f..6733292 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -148,7 +148,6 @@
         'common/chrome_content_gpu_client.h',
         'common/chrome_content_plugin_client.cc',
         'common/chrome_content_plugin_client.h',
-        'common/chrome_descriptors.h',
         'common/common_glue.cc',
         'common/css_colors.h',
         'common/default_plugin.cc',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 15b9c45..dc65d2a 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -133,32 +133,6 @@
         'renderer/renderer_main_platform_delegate_linux.cc',
         'renderer/renderer_main_platform_delegate_mac.mm',
         'renderer/renderer_main_platform_delegate_win.cc',
-        'renderer/renderer_sandbox_support_linux.cc',
-        'renderer/renderer_sandbox_support_linux.h',
-        'renderer/renderer_webapplicationcachehost_impl.cc',
-        'renderer/renderer_webapplicationcachehost_impl.h',
-        'renderer/renderer_webaudiodevice_impl.cc',
-        'renderer/renderer_webaudiodevice_impl.h',
-        'renderer/renderer_webcookiejar_impl.cc',
-        'renderer/renderer_webcookiejar_impl.h',
-        'renderer/renderer_webidbcursor_impl.cc',
-        'renderer/renderer_webidbcursor_impl.h',
-        'renderer/renderer_webidbdatabase_impl.cc',
-        'renderer/renderer_webidbdatabase_impl.h',
-        'renderer/renderer_webidbfactory_impl.cc',
-        'renderer/renderer_webidbfactory_impl.h',
-        'renderer/renderer_webidbindex_impl.cc',
-        'renderer/renderer_webidbindex_impl.h',
-        'renderer/renderer_webidbobjectstore_impl.cc',
-        'renderer/renderer_webidbobjectstore_impl.h',
-        'renderer/renderer_webidbtransaction_impl.cc',
-        'renderer/renderer_webidbtransaction_impl.h',
-        'renderer/renderer_webkitclient_impl.cc',
-        'renderer/renderer_webkitclient_impl.h',
-        'renderer/renderer_webstoragearea_impl.cc',
-        'renderer/renderer_webstoragearea_impl.h',
-        'renderer/renderer_webstoragenamespace_impl.cc',
-        'renderer/renderer_webstoragenamespace_impl.h',
         # TODO(noelutz): Find a better way to include these files
         '<(protoc_out_dir)/chrome/renderer/safe_browsing/client_model.pb.cc',
         '<(protoc_out_dir)/chrome/renderer/safe_browsing/client_model.pb.h',
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc
index 3ea0f82..ceebdc6 100644
--- a/chrome/nacl/nacl_thread.cc
+++ b/chrome/nacl/nacl_thread.cc
@@ -12,7 +12,7 @@
 #include "native_client/src/shared/imc/nacl_imc.h"
 
 #if defined(OS_LINUX)
-#include "chrome/renderer/renderer_sandbox_support_linux.h"
+#include "content/renderer/renderer_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_MACOSX)
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc
index 45c4427..75e59ab 100644
--- a/chrome/renderer/render_process_impl.cc
+++ b/chrome/renderer/render_process_impl.cc
@@ -44,7 +44,7 @@
 #endif
 
 #if defined(OS_LINUX)
-#include "chrome/renderer/renderer_sandbox_support_linux.h"
+#include "content/renderer/renderer_sandbox_support_linux.h"
 #endif
 
 #if defined(OS_WIN)
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 40f9472..e321c84 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -46,8 +46,6 @@
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/render_view_visitor.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
-#include "chrome/renderer/renderer_webidbfactory_impl.h"
-#include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "chrome/renderer/search_extension.h"
 #include "chrome/renderer/searchbox_extension.h"
@@ -69,6 +67,8 @@
 #include "content/renderer/gpu_video_service_host.h"
 #include "content/renderer/indexed_db_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/renderer_webidbfactory_impl.h"
+#include "content/renderer/renderer_webkitclient_impl.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_platform_file.h"
 #include "net/base/net_errors.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 5f4572c..a04ad30 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -68,8 +68,6 @@
 #include "chrome/renderer/render_view_visitor.h"
 #include "chrome/renderer/render_widget_fullscreen.h"
 #include "chrome/renderer/render_widget_fullscreen_pepper.h"
-#include "chrome/renderer/renderer_webapplicationcachehost_impl.h"
-#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
 #include "chrome/renderer/searchbox.h"
@@ -99,6 +97,8 @@
 #include "content/renderer/notification_provider.h"
 #include "content/renderer/p2p/socket_dispatcher.h"
 #include "content/renderer/plugin_channel_host.h"
+#include "content/renderer/renderer_webapplicationcachehost_impl.h"
+#include "content/renderer/renderer_webstoragenamespace_impl.h"
 #include "content/renderer/speech_input_dispatcher.h"
 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/webplugin_delegate_proxy.h"
diff --git a/chrome/renderer/render_view.h b/chrome/renderer/render_view.h
index 954b952..ba118fd 100644
--- a/chrome/renderer/render_view.h
+++ b/chrome/renderer/render_view.h
@@ -29,7 +29,7 @@
 #include "chrome/renderer/external_popup_menu.h"
 #include "chrome/renderer/page_load_histograms.h"
 #include "chrome/renderer/render_widget.h"
-#include "chrome/renderer/renderer_webcookiejar_impl.h"
+#include "content/renderer/renderer_webcookiejar_impl.h"
 #include "content/common/navigation_gesture.h"
 #include "content/common/page_zoom.h"
 #include "content/renderer/pepper_plugin_delegate_impl.h"
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc
index 8081288..2b47560 100644
--- a/chrome/renderer/render_widget.cc
+++ b/chrome/renderer/render_widget.cc
@@ -16,7 +16,7 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webkitclient_impl.h"
+#include "content/renderer/renderer_webkitclient_impl.h"
 #include "gpu/common/gpu_trace_event.h"
 #include "ipc/ipc_sync_message.h"
 #include "skia/ext/platform_canvas.h"
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index d122fd7..5926163 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -45,7 +45,7 @@
 #if defined(OS_WIN)
 #include <strsafe.h>  // note: per msdn docs, this must *follow* other includes
 #elif defined(OS_LINUX)
-#include "chrome/renderer/renderer_sandbox_support_linux.h"
+#include "content/renderer/renderer_sandbox_support_linux.h"
 #endif
 
 // This definition of WriteBitmapFromPixels uses shared memory to communicate
diff --git a/chrome/test/render_view_test.h b/chrome/test/render_view_test.h
index e641573..5eeb327a 100644
--- a/chrome/test/render_view_test.h
+++ b/chrome/test/render_view_test.h
@@ -14,10 +14,10 @@
 #include "chrome/renderer/mock_render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
-#include "chrome/renderer/renderer_webkitclient_impl.h"
 #include "content/common/main_function_params.h"
 #include "content/common/native_web_keyboard_event.h"
 #include "content/common/sandbox_init_wrapper.h"
+#include "content/renderer/renderer_webkitclient_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 0cf79c2f..1b65c72 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -11,9 +11,9 @@
 #include "base/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
-#include "chrome/common/chrome_descriptors.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/chrome_descriptors.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
 
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc
index 0da3212..3c5db18 100644
--- a/content/browser/zygote_main_linux.cc
+++ b/content/browser/zygote_main_linux.cc
@@ -36,10 +36,10 @@
 #include "base/scoped_ptr.h"
 #include "base/sys_info.h"
 #include "build/build_config.h"
-#include "chrome/common/chrome_descriptors.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pepper_plugin_registry.h"
+#include "content/common/chrome_descriptors.h"
 #include "content/common/font_config_ipc_linux.h"
 #include "content/common/main_function_params.h"
 #include "content/common/process_watcher.h"
diff --git a/chrome/common/chrome_descriptors.h b/content/common/chrome_descriptors.h
index d83a017..166467d 100644
--- a/chrome/common/chrome_descriptors.h
+++ b/content/common/chrome_descriptors.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_CHROME_DESCRIPTORS_H_
-#define CHROME_COMMON_CHROME_DESCRIPTORS_H_
+#ifndef CONTENT_COMMON_CHROME_DESCRIPTORS_H_
+#define CONTENT_COMMON_CHROME_DESCRIPTORS_H_
 #pragma once
 
 #include "ipc/ipc_descriptors.h"
+
 // This is a list of global descriptor keys to be used with the
 // base::GlobalDescriptors object (see base/global_descriptors_posix.h)
 enum {
@@ -14,4 +15,4 @@ enum {
   kSandboxIPCChannel = kPrimaryIPCChannel + 2,  // http://code.google.com/p/chromium/LinuxSandboxIPC
 };
 
-#endif  // CHROME_COMMON_CHROME_DESCRIPTORS_H_
+#endif  // CONTENT_COMMON_CHROME_DESCRIPTORS_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 93ccbcc..57299ee 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -37,6 +37,7 @@
         'common/child_thread.h',
         'common/chrome_application_mac.h',
         'common/chrome_application_mac.mm',
+        'common/chrome_descriptors.h',
         'common/clipboard_messages.h',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 7dd7849..c12c2bd9 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -71,6 +71,32 @@
         'renderer/pepper_plugin_delegate_impl.h',
         'renderer/plugin_channel_host.cc',
         'renderer/plugin_channel_host.h',
+        'renderer/renderer_sandbox_support_linux.cc',
+        'renderer/renderer_sandbox_support_linux.h',
+        'renderer/renderer_webapplicationcachehost_impl.cc',
+        'renderer/renderer_webapplicationcachehost_impl.h',
+        'renderer/renderer_webaudiodevice_impl.cc',
+        'renderer/renderer_webaudiodevice_impl.h',
+        'renderer/renderer_webcookiejar_impl.cc',
+        'renderer/renderer_webcookiejar_impl.h',
+        'renderer/renderer_webidbcursor_impl.cc',
+        'renderer/renderer_webidbcursor_impl.h',
+        'renderer/renderer_webidbdatabase_impl.cc',
+        'renderer/renderer_webidbdatabase_impl.h',
+        'renderer/renderer_webidbfactory_impl.cc',
+        'renderer/renderer_webidbfactory_impl.h',
+        'renderer/renderer_webidbindex_impl.cc',
+        'renderer/renderer_webidbindex_impl.h',
+        'renderer/renderer_webidbobjectstore_impl.cc',
+        'renderer/renderer_webidbobjectstore_impl.h',
+        'renderer/renderer_webidbtransaction_impl.cc',
+        'renderer/renderer_webidbtransaction_impl.h',
+        'renderer/renderer_webkitclient_impl.cc',
+        'renderer/renderer_webkitclient_impl.h',
+        'renderer/renderer_webstoragearea_impl.cc',
+        'renderer/renderer_webstoragearea_impl.h',
+        'renderer/renderer_webstoragenamespace_impl.cc',
+        'renderer/renderer_webstoragenamespace_impl.h',
         'renderer/speech_input_dispatcher.cc',
         'renderer/speech_input_dispatcher.h',
         'renderer/webgraphicscontext3d_command_buffer_impl.cc',
diff --git a/content/renderer/indexed_db_dispatcher.cc b/content/renderer/indexed_db_dispatcher.cc
index d62ad6f..d422015 100644
--- a/content/renderer/indexed_db_dispatcher.cc
+++ b/content/renderer/indexed_db_dispatcher.cc
@@ -6,12 +6,12 @@
 
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
-#include "chrome/renderer/renderer_webidbcursor_impl.h"
-#include "chrome/renderer/renderer_webidbdatabase_impl.h"
-#include "chrome/renderer/renderer_webidbindex_impl.h"
-#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
-#include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "content/common/indexed_db_messages.h"
+#include "content/renderer/renderer_webidbcursor_impl.h"
+#include "content/renderer/renderer_webidbdatabase_impl.h"
+#include "content/renderer/renderer_webidbindex_impl.h"
+#include "content/renderer/renderer_webidbobjectstore_impl.h"
+#include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"
diff --git a/chrome/renderer/renderer_sandbox_support_linux.cc b/content/renderer/renderer_sandbox_support_linux.cc
index 37f2b07..3029bb9 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.cc
+++ b/content/renderer/renderer_sandbox_support_linux.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/renderer_sandbox_support_linux.h"
+#include "content/renderer/renderer_sandbox_support_linux.h"
 
 #include <sys/stat.h>
 
@@ -10,7 +10,7 @@
 #include "base/global_descriptors_posix.h"
 #include "base/pickle.h"
 #include "base/scoped_ptr.h"
-#include "chrome/common/chrome_descriptors.h"
+#include "content/common/chrome_descriptors.h"
 #include "content/common/sandbox_methods_linux.h"
 #include "content/common/unix_domain_socket_posix.h"
 
diff --git a/chrome/renderer/renderer_sandbox_support_linux.h b/content/renderer/renderer_sandbox_support_linux.h
index 51a78e7..bc482bd 100644
--- a/chrome/renderer/renderer_sandbox_support_linux.h
+++ b/content/renderer/renderer_sandbox_support_linux.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_RENDERER_SANDBOX_SUPPORT_LINUX_H_
-#define CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
+#ifndef CONTENT_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
+#define CONTENT_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
 #pragma once
 
 #include <stdint.h>
@@ -56,4 +56,4 @@ bool GetFontTable(int fd, uint32_t table, uint8_t* output,
 
 };  // namespace render_sandbox_support
 
-#endif  // CHROME_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
+#endif  // CONTENT_RENDERER_RENDERER_SANDBOX_SUPPORT_LINUX_H_
diff --git a/chrome/renderer/renderer_webapplicationcachehost_impl.cc b/content/renderer/renderer_webapplicationcachehost_impl.cc
index 0bd18a7..b7d628b 100644
--- a/chrome/renderer/renderer_webapplicationcachehost_impl.cc
+++ b/content/renderer/renderer_webapplicationcachehost_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 "chrome/renderer/renderer_webapplicationcachehost_impl.h"
+#include "content/renderer/renderer_webapplicationcachehost_impl.h"
 
 #include "chrome/common/content_settings_types.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/renderer_webapplicationcachehost_impl.h b/content/renderer/renderer_webapplicationcachehost_impl.h
index c8454e5..9727315 100644
--- a/chrome/renderer/renderer_webapplicationcachehost_impl.h
+++ b/content/renderer/renderer_webapplicationcachehost_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 CHROME_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
 #pragma once
 
 #include "webkit/appcache/web_application_cache_host_impl.h"
@@ -31,4 +31,4 @@ class RendererWebApplicationCacheHostImpl
   int routing_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBAPPLICATIONCACHEHOST_IMPL_H_
diff --git a/chrome/renderer/renderer_webaudiodevice_impl.cc b/content/renderer/renderer_webaudiodevice_impl.cc
index 1030da2..057132a 100644
--- a/chrome/renderer/renderer_webaudiodevice_impl.cc
+++ b/content/renderer/renderer_webaudiodevice_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 "chrome/renderer/renderer_webaudiodevice_impl.h"
+#include "content/renderer/renderer_webaudiodevice_impl.h"
 
 using WebKit::WebAudioDevice;
 using WebKit::WebVector;
diff --git a/chrome/renderer/renderer_webaudiodevice_impl.h b/content/renderer/renderer_webaudiodevice_impl.h
index 7222720..c798663 100644
--- a/chrome/renderer/renderer_webaudiodevice_impl.h
+++ b/content/renderer/renderer_webaudiodevice_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 CHROME_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
 
 #include <vector>
 
@@ -38,4 +38,4 @@ class RendererWebAudioDeviceImpl : public WebKit::WebAudioDevice,
   DISALLOW_COPY_AND_ASSIGN(RendererWebAudioDeviceImpl);
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBAUDIODEVICE_IMPL_H_
diff --git a/chrome/renderer/renderer_webcookiejar_impl.cc b/content/renderer/renderer_webcookiejar_impl.cc
index 29419c0..4fb1a0a 100644
--- a/chrome/renderer/renderer_webcookiejar_impl.cc
+++ b/content/renderer/renderer_webcookiejar_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 "chrome/renderer/renderer_webcookiejar_impl.h"
+#include "content/renderer/renderer_webcookiejar_impl.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/renderer/renderer_webcookiejar_impl.h b/content/renderer/renderer_webcookiejar_impl.h
index fe12095..dcd1d3f 100644
--- a/chrome/renderer/renderer_webcookiejar_impl.h
+++ b/content/renderer/renderer_webcookiejar_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 CHROME_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
 #pragma once
 
 #include "ipc/ipc_message.h"
@@ -42,4 +42,4 @@ class RendererWebCookieJarImpl : public WebKit::WebCookieJar {
   IPC::Message::Sender* sender_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBCOOKIEJAR_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/content/renderer/renderer_webidbcursor_impl.cc
index 8234c02..1bad237 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/content/renderer/renderer_webidbcursor_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 "chrome/renderer/renderer_webidbcursor_impl.h"
+#include "content/renderer/renderer_webidbcursor_impl.h"
 
 #include "chrome/renderer/render_thread.h"
 #include "content/common/indexed_db_messages.h"
diff --git a/chrome/renderer/renderer_webidbcursor_impl.h b/content/renderer/renderer_webidbcursor_impl.h
index 4d3723d..147345f 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.h
+++ b/content/renderer/renderer_webidbcursor_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 CHROME_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
 
 #include "base/basictypes.h"
 #include "content/common/indexed_db_key.h"
@@ -36,4 +36,4 @@ class RendererWebIDBCursorImpl : public WebKit::WebIDBCursor {
   int32 idb_cursor_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/renderer_webidbdatabase_impl.cc
index 5cea597..da99ed7 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/content/renderer/renderer_webidbdatabase_impl.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/renderer_webidbdatabase_impl.h"
+#include "content/renderer/renderer_webidbdatabase_impl.h"
 
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
-#include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.h b/content/renderer/renderer_webidbdatabase_impl.h
index 6d74c7b..d87c4b0 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.h
+++ b/content/renderer/renderer_webidbdatabase_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 CHROME_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -50,4 +50,4 @@ class RendererWebIDBDatabaseImpl : public WebKit::WebIDBDatabase {
   int32 idb_database_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBDATABASE_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbfactory_impl.cc b/content/renderer/renderer_webidbfactory_impl.cc
index e103673..a8de8e3 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.cc
+++ b/content/renderer/renderer_webidbfactory_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 "chrome/renderer/renderer_webidbfactory_impl.h"
+#include "content/renderer/renderer_webidbfactory_impl.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_thread.h"
diff --git a/chrome/renderer/renderer_webidbfactory_impl.h b/content/renderer/renderer_webidbfactory_impl.h
index 0b7d1ee..941dc81 100644
--- a/chrome/renderer/renderer_webidbfactory_impl.h
+++ b/content/renderer/renderer_webidbfactory_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 CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
 #pragma once
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
@@ -40,4 +40,4 @@ class RendererWebIDBFactoryImpl : public WebKit::WebIDBFactory {
       const WebKit::WebString& data_dir);
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBFACTORY_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/content/renderer/renderer_webidbindex_impl.cc
index c88dcb0..72c0e84 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/content/renderer/renderer_webidbindex_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/renderer_webidbindex_impl.h"
+#include "content/renderer/renderer_webidbindex_impl.h"
 
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.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/chrome/renderer/renderer_webidbindex_impl.h b/content/renderer/renderer_webidbindex_impl.h
index 106550b..e085122 100644
--- a/chrome/renderer/renderer_webidbindex_impl.h
+++ b/content/renderer/renderer_webidbindex_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 CHROME_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -44,4 +44,4 @@ class RendererWebIDBIndexImpl : public WebKit::WebIDBIndex {
   int32 idb_index_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBINDEX_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc
index aa4106c..af23fe5 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/renderer_webidbobjectstore_impl.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
+#include "content/renderer/renderer_webidbobjectstore_impl.h"
 
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webidbindex_impl.h"
-#include "chrome/renderer/renderer_webidbtransaction_impl.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/renderer_webidbindex_impl.h"
+#include "content/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.h b/content/renderer/renderer_webidbobjectstore_impl.h
index 564a6b9..802ba32 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.h
+++ b/content/renderer/renderer_webidbobjectstore_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 CHROME_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -69,4 +69,4 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
   int32 idb_object_store_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBOBJECTSTORE_IMPL_H_
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/content/renderer/renderer_webidbtransaction_impl.cc
index b4bbbbf..15a08d4 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/content/renderer/renderer_webidbtransaction_impl.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "content/renderer/renderer_webidbtransaction_impl.h"
 
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 #include "content/common/indexed_db_messages.h"
 #include "content/renderer/indexed_db_dispatcher.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"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.h b/content/renderer/renderer_webidbtransaction_impl.h
index e905c93..c7390ee 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.h
+++ b/content/renderer/renderer_webidbtransaction_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 CHROME_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -33,4 +33,4 @@ class RendererWebIDBTransactionImpl : public WebKit::WebIDBTransaction {
   int32 idb_transaction_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBIDBTRANSACTION_IMPL_H_
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/content/renderer/renderer_webkitclient_impl.cc
index 64a84d2..ae37b0d 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/content/renderer/renderer_webkitclient_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 "chrome/renderer/renderer_webkitclient_impl.h"
+#include "content/renderer/renderer_webkitclient_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ -14,9 +14,6 @@
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
-#include "chrome/renderer/renderer_webaudiodevice_impl.h"
-#include "chrome/renderer/renderer_webidbfactory_impl.h"
-#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
 #include "chrome/renderer/visitedlink_slave.h"
 #include "content/common/database_util.h"
 #include "content/common/file_system/webfilesystem_impl.h"
@@ -25,6 +22,9 @@
 #include "content/common/webblobregistry_impl.h"
 #include "content/common/webmessageportchannel_impl.h"
 #include "content/plugin/npobject_util.h"
+#include "content/renderer/renderer_webaudiodevice_impl.h"
+#include "content/renderer/renderer_webidbfactory_impl.h"
+#include "content/renderer/renderer_webstoragenamespace_impl.h"
 #include "content/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/renderer/websharedworkerrepository_impl.h"
 #include "googleurl/src/gurl.h"
@@ -60,7 +60,7 @@
 #include <map>
 
 #include "base/synchronization/lock.h"
-#include "chrome/renderer/renderer_sandbox_support_linux.h"
+#include "content/renderer/renderer_sandbox_support_linux.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebSandboxSupport.h"
 #endif
 
diff --git a/chrome/renderer/renderer_webkitclient_impl.h b/content/renderer/renderer_webkitclient_impl.h
index ba4cc69..41ea45e 100644
--- a/chrome/renderer/renderer_webkitclient_impl.h
+++ b/content/renderer/renderer_webkitclient_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 CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
 #pragma once
 
 #include "base/platform_file.h"
@@ -114,4 +114,4 @@ class RendererWebKitClientImpl : public webkit_glue::WebKitClientImpl {
   scoped_ptr<WebKit::WebBlobRegistry> blob_registry_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBKITCLIENT_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/content/renderer/renderer_webstoragearea_impl.cc
index fdc30c4..07d225c 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.cc
+++ b/content/renderer/renderer_webstoragearea_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 "chrome/renderer/renderer_webstoragearea_impl.h"
+#include "content/renderer/renderer_webstoragearea_impl.h"
 
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
diff --git a/chrome/renderer/renderer_webstoragearea_impl.h b/content/renderer/renderer_webstoragearea_impl.h
index 52bc1d4..dba539e 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.h
+++ b/content/renderer/renderer_webstoragearea_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 CHROME_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -34,4 +34,4 @@ class RendererWebStorageAreaImpl : public WebKit::WebStorageArea {
   int64 storage_area_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBSTORAGEAREA_IMPL_H_
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.cc b/content/renderer/renderer_webstoragenamespace_impl.cc
index 909de3f..5edfa39 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.cc
+++ b/content/renderer/renderer_webstoragenamespace_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/renderer_webstoragenamespace_impl.h"
+#include "content/renderer/renderer_webstoragenamespace_impl.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/renderer_webstoragearea_impl.h"
+#include "content/renderer/renderer_webstoragearea_impl.h"
 
 using WebKit::WebStorageArea;
 using WebKit::WebStorageNamespace;
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/content/renderer/renderer_webstoragenamespace_impl.h
index 7b03f32..7b938c8 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.h
+++ b/content/renderer/renderer_webstoragenamespace_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 CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
-#define CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
+#ifndef CONTENT_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
+#define CONTENT_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -31,4 +31,4 @@ class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
   int64 namespace_id_;
 };
 
-#endif  // CHROME_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_
+#endif  // CONTENT_RENDERER_RENDERER_WEBSTORAGENAMESPACE_IMPL_H_