Move appcache/file_sytem/device_orientation subdirectories of chrome\browser to content\browser.

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

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

40 files changed, 141 insertions, 144 deletions

diff --git a/chrome/browser/browsing_data_appcache_helper.h b/chrome/browser/browsing_data_appcache_helper.h
index b54b511..38eaed4 100644
--- a/chrome/browser/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data_appcache_helper.h
@@ -8,8 +8,8 @@
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
 #include "googleurl/src/gurl.h"
 
 class Profile;
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index ef4ff5a..f9667ca 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -12,9 +12,9 @@
 #include "base/ref_counted.h"
 #include "base/synchronization/waitable_event_watcher.h"
 #include "base/time.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
-#include "chrome/browser/cancelable_request.h"
 #include "chrome/common/notification_registrar.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/cancelable_request.h"
 
 class IOThread;
 class PluginDataRemover;
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 1ee0f31..e8b10ea4 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -22,7 +22,6 @@
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_creator.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
@@ -31,7 +30,6 @@
 #include "chrome/browser/extensions/external_extension_provider_impl.h"
 #include "chrome/browser/extensions/external_pref_extension_loader.h"
 #include "chrome/browser/extensions/pack_extension_job.cc"
-#include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_pref_update.h"
@@ -49,7 +47,9 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/browser_thread.h"
+#include "content/browser/file_system/browser_file_system_helper.h"
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 081b5e5..7634077 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -10,18 +10,18 @@
 #include <vector>
 
 #include "base/file_path.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
-#include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_webrequest_api.h"
-#include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/host_zoom_map.h"
 #include "net/base/cookie_policy.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/database/database_tracker.h"
diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc
index e969505..db1579b 100644
--- a/chrome/browser/profiles/profile.cc
+++ b/chrome/browser/profiles/profile.cc
@@ -14,19 +14,14 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "build/build_config.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/file_system/browser_file_system_helper.h"
-#include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/net/pref_proxy_config_service.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -43,6 +38,11 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/file_system/browser_file_system_helper.h"
+#include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "grit/locale_settings.h"
 #include "net/base/transport_security_state.h"
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 2e4956d..4b51e82 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -14,7 +14,6 @@
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background_contents_service.h"
@@ -23,8 +22,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_signin.h"
-#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/defaults.h"
@@ -41,12 +38,10 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon_service.h"
-#include "chrome/browser/file_system/browser_file_system_helper.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_permission_context.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/top_sites.h"
-#include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/gaia/token_service.h"
@@ -92,6 +87,11 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/chrome_blob_storage_context.h"
+#include "content/browser/file_system/browser_file_system_helper.h"
+#include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "grit/browser_resources.h"
 #include "grit/locale_settings.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index e78dcf9..3cd278a 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -27,15 +27,12 @@
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/appcache/appcache_dispatcher_host.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/device_orientation/message_filter.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
-#include "chrome/browser/file_system/file_system_dispatcher_host.h"
 #include "chrome/browser/geolocation/geolocation_dispatcher_host.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/io_thread.h"
@@ -68,11 +65,14 @@
 #include "chrome/common/result_codes.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"
+#include "content/browser/device_orientation/message_filter.h"
 #include "content/browser/gpu_process_host.h"
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
+#include "content/browser/file_system/file_system_dispatcher_host.h"
 #include "content/browser/mime_registry_message_filter.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/audio_renderer_host.h"
diff --git a/chrome/browser/webui/chrome_url_data_manager_backend.cc b/chrome/browser/webui/chrome_url_data_manager_backend.cc
index b49606b..fc386df 100644
--- a/chrome/browser/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/webui/chrome_url_data_manager_backend.cc
@@ -9,14 +9,14 @@
 #include "base/path_service.h"
 #include "base/ref_counted_memory.h"
 #include "base/string_util.h"
-#include "chrome/browser/appcache/view_appcache_internals_job_factory.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/net/view_blob_internals_job_factory.h"
 #include "chrome/browser/net/view_http_cache_job_factory.h"
 #include "chrome/browser/webui/shared_resources_data_source.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/appcache/view_appcache_internals_job_factory.h"
+#include "content/browser/browser_thread.h"
 #include "googleurl/src/url_util.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index f164e63..343ca7c 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -12,21 +12,10 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/appcache/appcache_dispatcher_host.h"
-#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/file_system/file_system_dispatcher_host.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/mime_registry_message_filter.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
-#include "chrome/browser/renderer_host/blob_message_filter.h"
-#include "chrome/browser/renderer_host/database_message_filter.h"
-#include "chrome/browser/renderer_host/file_utilities_message_filter.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/browser/renderer_host/render_view_host_notification_task.h"
-#include "chrome/browser/renderer_host/socket_stream_dispatcher_host.h"
 #include "chrome/browser/worker_host/message_port_service.h"
 #include "chrome/browser/worker_host/worker_message_filter.h"
 #include "chrome/browser/worker_host/worker_service.h"
@@ -36,6 +25,17 @@
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/worker_messages.h"
+#include "content/browser/appcache/appcache_dispatcher_host.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/child_process_security_policy.h"
+#include "content/browser/file_system/file_system_dispatcher_host.h"
+#include "content/browser/renderer_host/blob_message_filter.h"
+#include "content/browser/renderer_host/database_message_filter.h"
+#include "content/browser/renderer_host/file_utilities_message_filter.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/renderer_host/render_view_host_delegate.h"
+#include "content/browser/renderer_host/render_view_host_notification_task.h"
+#include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
 #include "net/base/mime_util.h"
 #include "ipc/ipc_switches.h"
 #include "net/base/registry_controlled_domain.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index b2c179a..36092bb 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -96,14 +96,6 @@
         'browser/app_controller_mac.mm',
         'browser/app_icon_win.cc',
         'browser/app_icon_win.h',
-        'browser/appcache/appcache_dispatcher_host.cc',
-        'browser/appcache/appcache_dispatcher_host.h',
-        'browser/appcache/appcache_frontend_proxy.cc',
-        'browser/appcache/appcache_frontend_proxy.h',
-        'browser/appcache/chrome_appcache_service.cc',
-        'browser/appcache/chrome_appcache_service.h',
-        'browser/appcache/view_appcache_internals_job_factory.cc',
-        'browser/appcache/view_appcache_internals_job_factory.h',
         'browser/autocomplete/autocomplete.cc',
         'browser/autocomplete/autocomplete.h',
         'browser/autocomplete/autocomplete_accessibility.cc',
@@ -823,16 +815,6 @@
         'browser/defaults.h',
         'browser/desktop_notification_handler.cc',
         'browser/desktop_notification_handler.h',
-        'browser/device_orientation/accelerometer_mac.cc',
-        'browser/device_orientation/accelerometer_mac.h',
-        'browser/device_orientation/data_fetcher.h',
-        'browser/device_orientation/message_filter.cc',
-        'browser/device_orientation/message_filter.h',
-        'browser/device_orientation/orientation.h',
-        'browser/device_orientation/provider.cc',
-        'browser/device_orientation/provider.h',
-        'browser/device_orientation/provider_impl.cc',
-        'browser/device_orientation/provider_impl.h',
         'browser/diagnostics/diagnostics_main.cc',
         'browser/diagnostics/diagnostics_main.h',
         'browser/diagnostics/diagnostics_model.cc',
@@ -1108,10 +1090,6 @@
         'browser/file_path_watcher/file_path_watcher_win.cc',
         'browser/file_select_helper.cc',
         'browser/file_select_helper.h',
-        'browser/file_system/browser_file_system_helper.cc',
-        'browser/file_system/browser_file_system_helper.h',
-        'browser/file_system/file_system_dispatcher_host.cc',
-        'browser/file_system/file_system_dispatcher_host.h',
         'browser/first_run/first_run.cc',
         'browser/first_run/first_run.h',
         'browser/first_run/first_run_gtk.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index ebc3820..f378b02 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -546,7 +546,6 @@
       ],
       'sources': [
         'app/chrome_main_uitest.cc',
-        'browser/appcache/appcache_ui_test.cc',
         'browser/browser_encoding_uitest.cc',
         'browser/download/download_uitest.cc',
         'browser/download/save_page_uitest.cc',
@@ -599,6 +598,7 @@
         'test/ui/sunspider_uitest.cc',
         'test/ui/v8_benchmark_uitest.cc',
         'worker/worker_uitest.cc',
+        '../content/browser/appcache/appcache_ui_test.cc',
         '../content/browser/in_process_webkit/dom_storage_uitest.cc',
         '../content/browser/renderer_host/resource_dispatcher_host_uitest.cc',
       ],
@@ -1144,7 +1144,6 @@
         'browser/about_flags_unittest.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
-        'browser/appcache/chrome_appcache_service_unittest.cc',
         'browser/app_controller_mac_unittest.mm',
         'browser/autocomplete_history_manager_unittest.cc',
         'browser/autocomplete/autocomplete_edit_unittest.cc',
@@ -1262,7 +1261,6 @@
         'browser/content_settings/stub_settings_observer.h',
         'browser/cookies_tree_model_unittest.cc',
         'browser/debugger/devtools_manager_unittest.cc',
-        'browser/device_orientation/provider_unittest.cc',
         'browser/download/base_file_unittest.cc',
         'browser/download/download_file_unittest.cc',
         'browser/download/download_manager_unittest.cc',
@@ -1842,8 +1840,10 @@
         'test/v8_unit_test.cc',
         'test/v8_unit_test.h',
         'tools/convert_dict/convert_dict_unittest.cc',
+        '../content/browser/appcache/chrome_appcache_service_unittest.cc',
         '../content/browser/browser_thread_unittest.cc',
         '../content/browser/child_process_security_policy_unittest.cc',
+        '../content/browser/device_orientation/provider_unittest.cc',
         '../content/browser/gpu_blacklist_unittest.cc',
         '../content/browser/host_zoom_map_unittest.cc',
         '../content/browser/in_process_webkit/webkit_context_unittest.cc',
@@ -2171,7 +2171,6 @@
         'browser/chromeos/tab_closeable_state_watcher_browsertest.cc',
         'browser/chromeos/update_browsertest.cc',
         'browser/crash_recovery_browsertest.cc',
-        'browser/device_orientation/device_orientation_browsertest.cc',
         'browser/download/download_browsertest.cc',
         'browser/download/save_page_browsertest.cc',
         'browser/extensions/alert_apitest.cc',
@@ -2320,6 +2319,7 @@
         'test/render_view_test.cc',
         'test/render_view_test.h',
         '../content/browser/child_process_security_policy_browsertest.cc',
+        '../content/browser/device_orientation/device_orientation_browsertest.cc',
         '../content/browser/in_process_webkit/dom_storage_browsertest.cc',
         '../content/browser/in_process_webkit/indexed_db_browsertest.cc',
         '../content/browser/plugin_service_browsertest.cc',
diff --git a/content/browser/OWNERS b/content/browser/OWNERS
new file mode 100644
index 0000000..63f6c51
--- /dev/null
+++ b/content/browser/OWNERS
@@ -0,0 +1 @@
+avi@chromium.org

diff --git a/chrome/browser/appcache/appcache_dispatcher_host.cc b/content/browser/appcache/appcache_dispatcher_host.cc
index 4c1a64a..a634f4a 100644
--- a/chrome/browser/appcache/appcache_dispatcher_host.cc
+++ b/content/browser/appcache/appcache_dispatcher_host.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/browser/appcache/appcache_dispatcher_host.h"
+#include "content/browser/appcache/appcache_dispatcher_host.h"
 
 #include "base/callback.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
 #include "chrome/common/render_messages.h"
 
 AppCacheDispatcherHost::AppCacheDispatcherHost(
diff --git a/chrome/browser/appcache/appcache_dispatcher_host.h b/content/browser/appcache/appcache_dispatcher_host.h
index 527a306..e6b9f34 100644
--- a/chrome/browser/appcache/appcache_dispatcher_host.h
+++ b/content/browser/appcache/appcache_dispatcher_host.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_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
-#define CHROME_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
 #pragma once
 
 #include <vector>
@@ -11,10 +11,9 @@
 #include "base/process.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/appcache/appcache_frontend_proxy.h"
-#include "chrome/browser/browser_message_filter.h"
-#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "ipc/ipc_message.h"
+#include "content/browser/appcache/appcache_frontend_proxy.h"
+#include "content/browser/browser_message_filter.h"
+#include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "webkit/appcache/appcache_backend_impl.h"
 
 class ChromeAppCacheService;
@@ -94,4 +93,4 @@ class AppCacheDispatcherHost : public BrowserMessageFilter {
   DISALLOW_COPY_AND_ASSIGN(AppCacheDispatcherHost);
 };
 
-#endif  // CHROME_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_DISPATCHER_HOST_H_
diff --git a/chrome/browser/appcache/appcache_frontend_proxy.cc b/content/browser/appcache/appcache_frontend_proxy.cc
index d181b14..a38d029 100644
--- a/chrome/browser/appcache/appcache_frontend_proxy.cc
+++ b/content/browser/appcache/appcache_frontend_proxy.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/browser/appcache/appcache_frontend_proxy.h"
+#include "content/browser/appcache/appcache_frontend_proxy.h"
 
 #include "chrome/common/render_messages.h"
 
diff --git a/chrome/browser/appcache/appcache_frontend_proxy.h b/content/browser/appcache/appcache_frontend_proxy.h
index 51e1f95..f16a423 100644
--- a/chrome/browser/appcache/appcache_frontend_proxy.h
+++ b/content/browser/appcache/appcache_frontend_proxy.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_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
-#define CHROME_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
+#ifndef CONTENT_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
+#define CONTENT_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
 #pragma once
 
 #include <string>
@@ -37,4 +37,4 @@ class AppCacheFrontendProxy : public appcache::AppCacheFrontend {
   IPC::Message::Sender* sender_;
 };
 
-#endif  // CHROME_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
+#endif  // CONTENT_BROWSER_APPCACHE_APPCACHE_FRONTEND_PROXY_H_
diff --git a/chrome/browser/appcache/appcache_ui_test.cc b/content/browser/appcache/appcache_ui_test.cc
index 58ca32b..58ca32b 100644
--- a/chrome/browser/appcache/appcache_ui_test.cc
+++ b/content/browser/appcache/appcache_ui_test.cc
diff --git a/chrome/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc
index 57b4e31..68c7ece 100644
--- a/chrome/browser/appcache/chrome_appcache_service.cc
+++ b/content/browser/appcache/chrome_appcache_service.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/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
diff --git a/chrome/browser/appcache/chrome_appcache_service.h b/content/browser/appcache/chrome_appcache_service.h
index 0b43759..8081122 100644
--- a/chrome/browser/appcache/chrome_appcache_service.h
+++ b/content/browser/appcache/chrome_appcache_service.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
-#define CHROME_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
+#ifndef CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
+#define CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
 #pragma once
 
 #include "base/ref_counted.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/common/notification_registrar.h"
+#include "content/browser/browser_thread.h"
 #include "webkit/appcache/appcache_policy.h"
 #include "webkit/appcache/appcache_service.h"
 
@@ -69,4 +69,4 @@ class ChromeAppCacheService
   DISALLOW_COPY_AND_ASSIGN(ChromeAppCacheService);
 };
 
-#endif  // CHROME_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
+#endif  // CONTENT_BROWSER_APPCACHE_CHROME_APPCACHE_SERVICE_H_
diff --git a/chrome/browser/appcache/chrome_appcache_service_unittest.cc b/content/browser/appcache/chrome_appcache_service_unittest.cc
index 85ba6a24..0c5c512 100644
--- a/chrome/browser/appcache/chrome_appcache_service_unittest.cc
+++ b/content/browser/appcache/chrome_appcache_service_unittest.cc
@@ -6,12 +6,12 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_temp_dir.h"
-#include "chrome/browser/appcache/chrome_appcache_service.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/thread_test_helper.h"
+#include "content/browser/appcache/chrome_appcache_service.h"
+#include "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/appcache/appcache_storage_impl.h"
 
diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.cc b/content/browser/appcache/view_appcache_internals_job_factory.cc
index 6de6a6a..4a06999 100644
--- a/chrome/browser/appcache/view_appcache_internals_job_factory.cc
+++ b/content/browser/appcache/view_appcache_internals_job_factory.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/browser/appcache/view_appcache_internals_job_factory.h"
+#include "content/browser/appcache/view_appcache_internals_job_factory.h"
 
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.h b/content/browser/appcache/view_appcache_internals_job_factory.h
index 45fdff3..d488b01 100644
--- a/chrome/browser/appcache/view_appcache_internals_job_factory.h
+++ b/content/browser/appcache/view_appcache_internals_job_factory.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_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
-#define CHROME_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
+#ifndef CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
+#define CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
 #pragma once
 
 namespace net {
@@ -19,5 +19,4 @@ class ViewAppCacheInternalsJobFactory {
   static net::URLRequestJob* CreateJobForRequest(net::URLRequest* request);
 };
 
-#endif  // CHROME_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
-
+#endif  // CONTENT_BROWSER_APPCACHE_VIEW_APPCACHE_INTERNALS_JOB_FACTORY_H_
diff --git a/chrome/browser/device_orientation/accelerometer_mac.cc b/content/browser/device_orientation/accelerometer_mac.cc
index e4ae516..f642212 100644
--- a/chrome/browser/device_orientation/accelerometer_mac.cc
+++ b/content/browser/device_orientation/accelerometer_mac.cc
@@ -48,14 +48,14 @@
 //    Wakefield, MA 01880
 //    (781) 665-0053
 
-#include "chrome/browser/device_orientation/accelerometer_mac.h"
+#include "content/browser/device_orientation/accelerometer_mac.h"
 
 #include <math.h>
 #include <sys/sysctl.h>
 
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/orientation.h"
 
 namespace device_orientation {
 
diff --git a/chrome/browser/device_orientation/accelerometer_mac.h b/content/browser/device_orientation/accelerometer_mac.h
index 5771cea..d4480c8 100644
--- a/chrome/browser/device_orientation/accelerometer_mac.h
+++ b/content/browser/device_orientation/accelerometer_mac.h
@@ -48,15 +48,15 @@
 //    Wakefield, MA 01880
 //    (781) 665-0053
 
-#ifndef CHROME_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
 #pragma once
 
 #include <vector>
 
 #include <IOKit/IOKitLib.h>
 
-#include "chrome/browser/device_orientation/data_fetcher.h"
+#include "content/browser/device_orientation/data_fetcher.h"
 
 namespace device_orientation {
 
@@ -101,4 +101,4 @@ class AccelerometerMac : public DataFetcher {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_ACCELEROMETER_MAC_H_
diff --git a/chrome/browser/device_orientation/data_fetcher.h b/content/browser/device_orientation/data_fetcher.h
index 2b57fa9..6f6bd99 100644
--- a/chrome/browser/device_orientation/data_fetcher.h
+++ b/content/browser/device_orientation/data_fetcher.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_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
 
 namespace device_orientation {
 
@@ -17,4 +17,4 @@ class DataFetcher {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_DATA_FETCHER_H_
diff --git a/chrome/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc
index 2c99b85..7646cae 100644
--- a/chrome/browser/device_orientation/device_orientation_browsertest.cc
+++ b/content/browser/device_orientation/device_orientation_browsertest.cc
@@ -5,13 +5,13 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/device_orientation/orientation.h"
-#include "chrome/browser/device_orientation/provider.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/provider.h"
+#include "content/browser/tab_contents/tab_contents.h"
 
 namespace device_orientation {
 
diff --git a/chrome/browser/device_orientation/message_filter.cc b/content/browser/device_orientation/message_filter.cc
index 06f49cb..4cb7501 100644
--- a/chrome/browser/device_orientation/message_filter.cc
+++ b/content/browser/device_orientation/message_filter.cc
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/device_orientation/message_filter.h"
+#include "content/browser/device_orientation/message_filter.h"
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/device_orientation/orientation.h"
-#include "chrome/browser/device_orientation/provider.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/renderer_host/render_view_host_notification_task.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
-#include "ipc/ipc_message.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/provider.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/renderer_host/render_view_host_notification_task.h"
 
 namespace device_orientation {
 
diff --git a/chrome/browser/device_orientation/message_filter.h b/content/browser/device_orientation/message_filter.h
index 468fe6f..606d8bf 100644
--- a/chrome/browser/device_orientation/message_filter.h
+++ b/content/browser/device_orientation/message_filter.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
 
 #include <map>
 
-#include "chrome/browser/browser_message_filter.h"
-#include "chrome/browser/device_orientation/provider.h"
+#include "content/browser/browser_message_filter.h"
+#include "content/browser/device_orientation/provider.h"
 
 namespace device_orientation {
 
@@ -41,4 +41,4 @@ class MessageFilter : public BrowserMessageFilter {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_MESSAGE_FILTER_H_
diff --git a/chrome/browser/device_orientation/orientation.h b/content/browser/device_orientation/orientation.h
index de876c9..3f15d66 100644
--- a/chrome/browser/device_orientation/orientation.h
+++ b/content/browser/device_orientation/orientation.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_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
 
 namespace device_orientation {
 class Orientation {
@@ -50,4 +50,4 @@ class Orientation {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_ORIENTATION_H_
diff --git a/chrome/browser/device_orientation/provider.cc b/content/browser/device_orientation/provider.cc
index 8f0862a..e10da2b 100644
--- a/chrome/browser/device_orientation/provider.cc
+++ b/content/browser/device_orientation/provider.cc
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/device_orientation/provider.h"
+#include "content/browser/device_orientation/provider.h"
 
 #include "base/logging.h"
-#include "chrome/browser/browser_thread.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/device_orientation/data_fetcher.h"
+#include "content/browser/device_orientation/provider_impl.h"
 
 #if defined(OS_MACOSX)
-#include "chrome/browser/device_orientation/accelerometer_mac.h"
+#include "content/browser/device_orientation/accelerometer_mac.h"
 #endif
 
-#include "chrome/browser/device_orientation/data_fetcher.h"
-#include "chrome/browser/device_orientation/provider_impl.h"
-
 namespace device_orientation {
 
 Provider* Provider::GetInstance() {
diff --git a/chrome/browser/device_orientation/provider.h b/content/browser/device_orientation/provider.h
index 8f19eb7..ab44a89 100644
--- a/chrome/browser/device_orientation/provider.h
+++ b/content/browser/device_orientation/provider.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_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
 
 #include "base/ref_counted.h"
 
@@ -53,4 +53,4 @@ class Provider : public base::RefCountedThreadSafe<Provider> {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_H_
diff --git a/chrome/browser/device_orientation/provider_impl.cc b/content/browser/device_orientation/provider_impl.cc
index 6fe33cf..27c155f 100644
--- a/chrome/browser/device_orientation/provider_impl.cc
+++ b/content/browser/device_orientation/provider_impl.cc
@@ -11,8 +11,8 @@
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/device_orientation/orientation.h"
-#include "chrome/browser/device_orientation/provider_impl.h"
+#include "content/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/provider_impl.h"
 
 namespace device_orientation {
 
diff --git a/chrome/browser/device_orientation/provider_impl.h b/content/browser/device_orientation/provider_impl.h
index 7396035..e8e2b99 100644
--- a/chrome/browser/device_orientation/provider_impl.h
+++ b/content/browser/device_orientation/provider_impl.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
-#define CHROME_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
+#ifndef CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
+#define CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
 
 #include <set>
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
-#include "chrome/browser/device_orientation/data_fetcher.h"
-#include "chrome/browser/device_orientation/orientation.h"
-#include "chrome/browser/device_orientation/provider.h"
+#include "content/browser/device_orientation/data_fetcher.h"
+#include "content/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/provider.h"
 
 class MessageLoop;
 
@@ -82,4 +82,4 @@ class ProviderImpl : public Provider {
 
 }  // namespace device_orientation
 
-#endif  // CHROME_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
+#endif  // CONTENT_BROWSER_DEVICE_ORIENTATION_PROVIDER_IMPL_H_
diff --git a/chrome/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index 131504a..facfc0c 100644
--- a/chrome/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/message_loop.h"
 #include "base/synchronization/lock.h"
 #include "base/task.h"
-#include "chrome/browser/device_orientation/data_fetcher.h"
-#include "chrome/browser/device_orientation/orientation.h"
-#include "chrome/browser/device_orientation/provider.h"
-#include "chrome/browser/device_orientation/provider_impl.h"
+#include "content/browser/device_orientation/data_fetcher.h"
+#include "content/browser/device_orientation/orientation.h"
+#include "content/browser/device_orientation/provider.h"
+#include "content/browser/device_orientation/provider_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace device_orientation {
diff --git a/chrome/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc
index 47b3e5e..81666f0 100644
--- a/chrome/browser/file_system/browser_file_system_helper.cc
+++ b/content/browser/file_system/browser_file_system_helper.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/browser/file_system/browser_file_system_helper.h"
+#include "content/browser/file_system/browser_file_system_helper.h"
 
 #include "base/file_path.h"
 #include "base/command_line.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/common/chrome_switches.h"
+#include "content/browser/browser_thread.h"
 
 scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext(
         const FilePath& profile_path, bool is_incognito) {
diff --git a/chrome/browser/file_system/browser_file_system_helper.h b/content/browser/file_system/browser_file_system_helper.h
index b99f9d1..55c6e3a 100644
--- a/chrome/browser/file_system/browser_file_system_helper.h
+++ b/content/browser/file_system/browser_file_system_helper.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_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
-#define CHROME_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
+#ifndef CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
+#define CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ -14,4 +14,4 @@
 scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext(
         const FilePath& profile_path, bool is_incognito);
 
-#endif  // CHROME_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
+#endif  // CONTENT_BROWSER_FILE_SYSTEM_BROWSER_FILE_SYSTEM_HELPER_H_
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.cc b/content/browser/file_system/file_system_dispatcher_host.cc
index 4360b52..df4f5d8 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.cc
+++ b/content/browser/file_system/file_system_dispatcher_host.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/browser/file_system/file_system_dispatcher_host.h"
+#include "content/browser/file_system/file_system_dispatcher_host.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/browser/file_system/file_system_dispatcher_host.h b/content/browser/file_system/file_system_dispatcher_host.h
index bf807bb..728720e 100644
--- a/chrome/browser/file_system/file_system_dispatcher_host.h
+++ b/content/browser/file_system/file_system_dispatcher_host.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
-#define CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/id_map.h"
-#include "chrome/browser/browser_message_filter.h"
+#include "content/browser/browser_message_filter.h"
 #include "webkit/fileapi/file_system_types.h"
 
 namespace base {
@@ -101,4 +101,4 @@ class FileSystemDispatcherHost : public BrowserMessageFilter {
   DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcherHost);
 };
 
-#endif  // CHROME_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
+#endif  // CONTENT_BROWSER_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_HOST_H_
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 7d2f7c3..9e7837e 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -22,6 +22,14 @@
         '..',
       ],
       'sources': [
+        'browser/appcache/appcache_dispatcher_host.cc',
+        'browser/appcache/appcache_dispatcher_host.h',
+        'browser/appcache/appcache_frontend_proxy.cc',
+        'browser/appcache/appcache_frontend_proxy.h',
+        'browser/appcache/chrome_appcache_service.cc',
+        'browser/appcache/chrome_appcache_service.h',
+        'browser/appcache/view_appcache_internals_job_factory.cc',
+        'browser/appcache/view_appcache_internals_job_factory.h',
         'browser/browser_child_process_host.cc',
         'browser/browser_child_process_host.h',
         'browser/browser_message_filter.cc',
@@ -46,8 +54,22 @@
         'browser/chrome_blob_storage_context.h',
         'browser/cross_site_request_manager.cc',
         'browser/cross_site_request_manager.h',
+        'browser/device_orientation/accelerometer_mac.cc',
+        'browser/device_orientation/accelerometer_mac.h',
+        'browser/device_orientation/data_fetcher.h',
+        'browser/device_orientation/message_filter.cc',
+        'browser/device_orientation/message_filter.h',
+        'browser/device_orientation/orientation.h',
+        'browser/device_orientation/provider.cc',
+        'browser/device_orientation/provider.h',
+        'browser/device_orientation/provider_impl.cc',
+        'browser/device_orientation/provider_impl.h',
         'browser/disposition_utils.cc',
         'browser/disposition_utils.h',
+        'browser/file_system/browser_file_system_helper.cc',
+        'browser/file_system/browser_file_system_helper.h',
+        'browser/file_system/file_system_dispatcher_host.cc',
+        'browser/file_system/file_system_dispatcher_host.h',
         'browser/gpu_blacklist.cc',
         'browser/gpu_blacklist.h',
         'browser/gpu_process_host.cc',
diff --git a/tools/checkdeps/checkdeps.py b/tools/checkdeps/checkdeps.py
index 6ee22b1..8bce31e 100755
--- a/tools/checkdeps/checkdeps.py
+++ b/tools/checkdeps/checkdeps.py
@@ -284,7 +284,7 @@ def ShouldCheckFile(file_name):
       '.mm',
   ]
   basename, extension = os.path.splitext(file_name)
-  return extension in checked_extensions
+  return extension in checked_extensions or basename.find('test') != -1
 
 
 def CheckLine(rules, line):