Move content_browser_client.h to public, and while at it, move

window_container_type.h as well since it is included by
content_browser_client.h

BUG=98716
TEST=it builds + existing tests

Review URL: http://codereview.chromium.org/8346017

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

62 files changed, 71 insertions, 71 deletions

diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 3864da3..bc61dcc 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -14,9 +14,9 @@
 #include "base/task.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/tab_contents/background_contents.h"
-#include "content/common/window_container_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/window_container_type.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/chrome_browser_main_unittest.cc b/chrome/browser/chrome_browser_main_unittest.cc
index 8dee45f..e3c99b7 100644
--- a/chrome/browser/chrome_browser_main_unittest.cc
+++ b/chrome/browser/chrome_browser_main_unittest.cc
@@ -10,9 +10,9 @@
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/main_function_params.h"
 #include "content/common/sandbox_init_wrapper.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index edfb42e..d8fb323 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "content/browser/content_browser_client.h"
+#include "content/public/browser/content_browser_client.h"
 
 namespace chrome {
 
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 6b179b6..de5fd35 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -17,7 +17,6 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/worker_devtools_manager.h"
@@ -27,8 +26,9 @@
 #include "content/browser/worker_host/worker_service.h"
 #include "content/browser/worker_host/worker_service_observer.h"
 #include "content/common/worker_messages.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/notification_registrar.h"
 #include "net/test/test_server.h"
 
 namespace {
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 0490567..5cac4c6 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -30,7 +30,6 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_notification_details.h"
@@ -41,6 +40,7 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/bindings_policy.h"
 #include "grit/generated_resources.h"
 
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index 5cfa428..5fad93c 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -36,7 +36,6 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/common/chrome_view_types.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -48,6 +47,7 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/bindings_policy.h"
 #include "grit/browser_resources.h"
diff --git a/chrome/browser/tab_contents/background_contents.h b/chrome/browser/tab_contents/background_contents.h
index e0e091b..8b78a27 100644
--- a/chrome/browser/tab_contents/background_contents.h
+++ b/chrome/browser/tab_contents/background_contents.h
@@ -13,9 +13,9 @@
 #include "chrome/browser/tab_contents/render_view_host_delegate_helper.h"
 #include "content/browser/javascript_dialogs.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
-#include "content/common/window_container_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/window_container_type.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class TabContents;
diff --git a/chrome/browser/tab_contents/render_view_host_delegate_helper.h b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
index cc84643..6b178d4 100644
--- a/chrome/browser/tab_contents/render_view_host_delegate_helper.h
+++ b/chrome/browser/tab_contents/render_view_host_delegate_helper.h
@@ -10,9 +10,9 @@
 
 #include "base/basictypes.h"
 #include "content/browser/webui/web_ui.h"
-#include "content/common/window_container_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "content/public/common/window_container_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/chrome/browser/ui/views/extensions/extension_view.cc b/chrome/browser/ui/views/extensions/extension_view.cc
index d25ebe56..0674faa 100644
--- a/chrome/browser/ui/views/extensions/extension_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_view.cc
@@ -6,9 +6,9 @@
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/ui/views/extensions/extension_popup.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/public/browser/content_browser_client.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/ui/views/notifications/balloon_view_host.cc b/chrome/browser/ui/views/notifications/balloon_view_host.cc
index bb1fc39..952593c 100644
--- a/chrome/browser/ui/views/notifications/balloon_view_host.cc
+++ b/chrome/browser/ui/views/notifications/balloon_view_host.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/views/notifications/balloon_view_host.h"
 
 #include "chrome/browser/notifications/balloon.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #if defined(OS_WIN)
@@ -18,6 +17,7 @@
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #endif
 #endif
+#include "content/public/browser/content_browser_client.h"
 #include "views/widget/widget.h"
 
 class BalloonViewHostView : public views::NativeViewHost {
diff --git a/content/browser/appcache/chrome_appcache_service.cc b/content/browser/appcache/chrome_appcache_service.cc
index 72fa620..777ec03 100644
--- a/content/browser/appcache/chrome_appcache_service.cc
+++ b/content/browser/appcache/chrome_appcache_service.cc
@@ -6,8 +6,8 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "net/base/net_errors.h"
 #include "webkit/quota/quota_manager.h"
diff --git a/content/browser/browser_child_process_host.cc b/content/browser/browser_child_process_host.cc
index 63604a3..50271cc 100644
--- a/content/browser/browser_child_process_host.cc
+++ b/content/browser/browser_child_process_host.cc
@@ -14,13 +14,13 @@
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/browser/trace_message_filter.h"
 #include "content/common/notification_service.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
diff --git a/content/browser/browser_main.cc b/content/browser/browser_main.cc
index b0c9c19..8c75d2a 100644
--- a/content/browser/browser_main.cc
+++ b/content/browser/browser_main.cc
@@ -14,12 +14,12 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/tracked_objects.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
 #include "content/common/notification_service.h"
 #include "content/common/result_codes.h"
 #include "content/common/sandbox_policy.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "crypto/nss_util.h"
 #include "net/base/network_change_notifier.h"
diff --git a/content/browser/browser_url_handler.cc b/content/browser/browser_url_handler.cc
index d0ed4a2..cf05366 100644
--- a/content/browser/browser_url_handler.cc
+++ b/content/browser/browser_url_handler.cc
@@ -5,8 +5,8 @@
 #include "content/browser/browser_url_handler.h"
 
 #include "base/string_util.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/webui/web_ui.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/content/browser/browsing_instance.cc b/content/browser/browsing_instance.cc
index 7dded8c..d52d6e0 100644
--- a/content/browser/browsing_instance.cc
+++ b/content/browser/browsing_instance.cc
@@ -7,9 +7,9 @@
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "content/browser/browser_context.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/webui/web_ui_factory.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc
index 5753112..9020df7 100644
--- a/content/browser/child_process_launcher.cc
+++ b/content/browser/child_process_launcher.cc
@@ -13,10 +13,10 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/chrome_descriptors.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index fc6bea5..1cf27bd 100644
--- a/content/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -10,12 +10,12 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/content_browser_client.h"
 #include "googleurl/src/gurl.h"
 
 // static
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index 3ac775f..5252441 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
@@ -12,6 +11,7 @@
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/tab_contents/tab_contents_delegate.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
+#include "content/public/browser/content_browser_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::TimeDelta;
diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc
index 9e278b0..2aa2663 100644
--- a/content/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/debugger/devtools_netlog_observer.cc
@@ -8,8 +8,8 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/resource_response.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_net_log_params.h"
 #include "net/http/http_response_headers.h"
diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/debugger/render_view_devtools_agent_host.cc
index b393240..1adf627 100644
--- a/content/browser/debugger/render_view_devtools_agent_host.cc
+++ b/content/browser/debugger/render_view_devtools_agent_host.cc
@@ -5,7 +5,6 @@
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 
 #include "base/basictypes.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_process_host.h"
@@ -14,6 +13,7 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 
 RenderViewDevToolsAgentHost::Instances RenderViewDevToolsAgentHost::instances_;
diff --git a/content/browser/download/base_file.cc b/content/browser/download/base_file.cc
index c1daaed..9683b50 100644
--- a/content/browser/download/base_file.cc
+++ b/content/browser/download/base_file.cc
@@ -11,8 +11,8 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_stats.h"
+#include "content/public/browser/content_browser_client.h"
 #include "crypto/secure_hash.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
diff --git a/content/browser/download/download_item.cc b/content/browser/download/download_item.cc
index 4ffe6c7..2b048c4 100644
--- a/content/browser/download/download_item.cc
+++ b/content/browser/download/download_item.cc
@@ -16,7 +16,6 @@
 #include "base/utf_string_conversions.h"
 #include "net/base/net_util.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_file.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
@@ -27,6 +26,7 @@
 #include "content/browser/download/download_request_handle.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/interrupt_reasons.h"
+#include "content/public/browser/content_browser_client.h"
 
 // A DownloadItem normally goes through the following states:
 //      * Created (when download starts)
diff --git a/content/browser/download/download_manager.cc b/content/browser/download/download_manager.cc
index 7c4c5b7..c875a56 100644
--- a/content/browser/download/download_manager.cc
+++ b/content/browser/download/download_manager.cc
@@ -19,7 +19,6 @@
 #include "build/build_config.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
@@ -33,6 +32,7 @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 
 namespace {
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 308eff2..6dc99bd 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -20,7 +20,6 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_item.h"
 #include "content/browser/download/download_manager.h"
@@ -34,6 +33,7 @@
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
diff --git a/content/browser/geolocation/arbitrator_dependency_factory.cc b/content/browser/geolocation/arbitrator_dependency_factory.cc
index 2506d20..25f3954 100644
--- a/content/browser/geolocation/arbitrator_dependency_factory.cc
+++ b/content/browser/geolocation/arbitrator_dependency_factory.cc
@@ -4,9 +4,9 @@
 
 #include "content/browser/geolocation/arbitrator_dependency_factory.h"
 
-#include "content/browser/content_browser_client.h"
 #include "content/browser/geolocation/access_token_store.h"
 #include "content/browser/geolocation/location_provider.h"
+#include "content/public/browser/content_browser_client.h"
 
 // GeolocationArbitratorDependencyFactory
 GeolocationArbitratorDependencyFactory::
diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index c46c4e6..8ff575a 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/scoped_temp_dir.h"
-#include "content/browser/content_browser_client.h"
+#include "content/public/browser/content_browser_client.h"
 
 namespace content {
 
diff --git a/content/browser/plugin_process_host.cc b/content/browser/plugin_process_host.cc
index f120d43..9da4b16 100644
--- a/content/browser/plugin_process_host.cc
+++ b/content/browser/plugin_process_host.cc
@@ -21,12 +21,12 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/resource_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/ui_base_switches.h"
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index 8b638935..b88bed2 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -17,7 +17,6 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/plugin_loader_posix.h"
 #include "content/browser/plugin_service_filter.h"
 #include "content/browser/ppapi_plugin_process_host.h"
@@ -30,6 +29,7 @@
 #include "content/common/plugin_messages.h"
 #include "content/common/utility_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "webkit/plugins/npapi/plugin_constants_win.h"
diff --git a/content/browser/renderer_host/browser_render_process_host.cc b/content/browser/renderer_host/browser_render_process_host.cc
index 0bc26f9..7711a50 100644
--- a/content/browser/renderer_host/browser_render_process_host.cc
+++ b/content/browser/renderer_host/browser_render_process_host.cc
@@ -33,7 +33,6 @@
 #include "content/browser/browser_child_process_host.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/device_orientation/message_filter.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/file_system/file_system_dispatcher_host.h"
@@ -78,6 +77,7 @@
 #include "content/common/resource_messages.h"
 #include "content/common/result_codes.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/renderer/render_process_impl.h"
 #include "content/renderer/render_thread_impl.h"
diff --git a/content/browser/renderer_host/buffered_resource_handler.cc b/content/browser/renderer_host/buffered_resource_handler.cc
index 9002bfc..bda2a4c 100644
--- a/content/browser/renderer_host/buffered_resource_handler.cc
+++ b/content/browser/renderer_host/buffered_resource_handler.cc
@@ -11,7 +11,6 @@
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ -20,6 +19,7 @@
 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
 #include "content/browser/resource_context.h"
 #include "content/common/resource_response.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index 7038283..f1193c1 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -12,8 +12,8 @@
 
 #include "base/stl_util.h"
 #include "content/browser/clipboard_dispatcher.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/clipboard_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 9c1fb9d..1e67aba 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -16,7 +16,6 @@
 #include "content/browser/browser_context.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/download_types.h"
 #include "content/browser/plugin_process_host.h"
@@ -34,6 +33,7 @@
 #include "content/common/desktop_notification_messages.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc
index d783884..1969e35 100644
--- a/content/browser/renderer_host/render_process_host.cc
+++ b/content/browser/renderer_host/render_process_host.cc
@@ -10,11 +10,11 @@
 #include "content/browser/browser_main.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/child_process_info.h"
 #include "content/common/content_constants.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 
diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index a562d54..9fda132 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -18,7 +18,6 @@
 #include "content/browser/browser_context.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/host_zoom_map.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
@@ -37,6 +36,7 @@
 #include "content/common/speech_input_messages.h"
 #include "content/common/swapped_out_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_types.h"
diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
index 8947391..d731754 100644
--- a/content/browser/renderer_host/render_view_host.h
+++ b/content/browser/renderer_host/render_view_host.h
@@ -16,7 +16,7 @@
 #include "base/process_util.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/common/content_export.h"
-#include "content/common/window_container_type.h"
+#include "content/public/common/window_container_type.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebConsoleMessage.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index b9962b6..e973874 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -16,8 +16,8 @@
 #include "base/string16.h"
 #include "base/values.h"
 #include "content/common/content_export.h"
-#include "content/common/window_container_type.h"
 #include "content/public/common/view_types.h"
+#include "content/public/common/window_container_type.h"
 #include "ipc/ipc_channel.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
diff --git a/content/browser/renderer_host/render_widget_helper.h b/content/browser/renderer_host/render_widget_helper.h
index cab0947..605a317 100644
--- a/content/browser/renderer_host/render_widget_helper.h
+++ b/content/browser/renderer_host/render_widget_helper.h
@@ -14,7 +14,7 @@
 #include "base/process.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "content/common/window_container_type.h"
+#include "content/public/common/window_container_type.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPopupType.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/surface/transport_dib.h"
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc
index 8abb488..047e620 100644
--- a/content/browser/renderer_host/render_widget_host_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/common/view_messages.h"
@@ -16,6 +15,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/test/test_browser_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/keycodes/keyboard_codes.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 40de3ae..9087bb0 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -19,7 +19,6 @@
 #include "content/browser/accessibility/browser_accessibility_state.h"
 #include "content/browser/accessibility/browser_accessibility_win.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/backing_store_win.h"
@@ -28,6 +27,7 @@
 #include "content/common/notification_service.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc
index 47418bc..e15bf14 100644
--- a/content/browser/renderer_host/resource_dispatcher_host.cc
+++ b/content/browser/renderer_host/resource_dispatcher_host.cc
@@ -24,7 +24,6 @@
 #include "content/browser/cert_store.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/chrome_blob_storage_context.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/cross_site_request_manager.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_manager.h"
@@ -55,6 +54,7 @@
 #include "content/common/notification_service.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/auth.h"
diff --git a/content/browser/renderer_host/socket_stream_dispatcher_host.cc b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
index a4f7961..25de8ad 100644
--- a/content/browser/renderer_host/socket_stream_dispatcher_host.cc
+++ b/content/browser/renderer_host/socket_stream_dispatcher_host.cc
@@ -5,11 +5,11 @@
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
 
 #include "base/logging.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/socket_stream_host.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_messages.h"
 #include "content/common/resource_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/cookie_monster.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/websockets/websocket_job.h"
diff --git a/content/browser/renderer_host/x509_user_cert_resource_handler.cc b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
index 9ca003c..0af3b1d 100644
--- a/content/browser/renderer_host/x509_user_cert_resource_handler.cc
+++ b/content/browser/renderer_host/x509_user_cert_resource_handler.cc
@@ -5,11 +5,11 @@
 #include "content/browser/renderer_host/x509_user_cert_resource_handler.h"
 
 #include "base/string_util.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/download_types.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/common/resource_response.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
diff --git a/content/browser/site_instance.cc b/content/browser/site_instance.cc
index 49e19a3..8f65c4d 100644
--- a/content/browser/site_instance.cc
+++ b/content/browser/site_instance.cc
@@ -5,10 +5,10 @@
 #include "content/browser/site_instance.h"
 
 #include "content/browser/browsing_instance.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/browser_render_process_host.h"
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/registry_controlled_domain.h"
diff --git a/content/browser/speech/speech_input_dispatcher_host.cc b/content/browser/speech/speech_input_dispatcher_host.cc
index 8a67476..62a9048 100644
--- a/content/browser/speech/speech_input_dispatcher_host.cc
+++ b/content/browser/speech/speech_input_dispatcher_host.cc
@@ -5,9 +5,9 @@
 #include "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/speech/speech_input_preferences.h"
 #include "content/common/speech_input_messages.h"
+#include "content/public/browser/content_browser_client.h"
 
 namespace speech_input {
 
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc
index 642b554..667e3ba 100644
--- a/content/browser/ssl/ssl_client_auth_handler.cc
+++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -6,11 +6,11 @@
 
 #include "base/bind.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "content/browser/ssl/ssl_client_auth_notification_details.h"
 #include "content/common/notification_service.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/x509_certificate.h"
 #include "net/url_request/url_request.h"
 
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 4709434..102ba7d 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -10,7 +10,6 @@
 #include "base/memory/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.h"
@@ -18,6 +17,7 @@
 #include "content/browser/ssl/ssl_request_info.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/cert_status_flags.h"
 #include "net/base/ssl_info.h"
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index d00ac6fb..851288ca 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -12,7 +12,6 @@
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_thread.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
@@ -25,6 +24,7 @@
 #include "content/common/dom_storage_common.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/page_transition_types.h"
diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc
index fb7e348..0773f56 100644
--- a/content/browser/tab_contents/navigation_entry.cc
+++ b/content/browser/tab_contents/navigation_entry.cc
@@ -6,9 +6,9 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/site_instance.h"
 #include "content/common/content_constants.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "ui/base/text/text_elider.h"
diff --git a/content/browser/tab_contents/render_view_host_manager.cc b/content/browser/tab_contents/render_view_host_manager.cc
index 50ab46e..977d749 100644
--- a/content/browser/tab_contents/render_view_host_manager.cc
+++ b/content/browser/tab_contents/render_view_host_manager.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "content/browser/content_browser_client.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_factory.h"
@@ -19,6 +18,7 @@
 #include "content/browser/webui/web_ui_factory.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 7d9af87..5b98734 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -15,7 +15,6 @@
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_context.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/download/download_stats.h"
@@ -44,6 +43,7 @@
 #include "content/common/intents_messages.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_types.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/url_constants.h"
diff --git a/content/browser/tab_contents/web_drag_source_gtk.cc b/content/browser/tab_contents/web_drag_source_gtk.cc
index a40b007..6aebd33 100644
--- a/content/browser/tab_contents/web_drag_source_gtk.cc
+++ b/content/browser/tab_contents/web_drag_source_gtk.cc
@@ -10,7 +10,6 @@
 #include "base/mime_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -18,6 +17,7 @@
 #include "content/browser/tab_contents/drag_utils_gtk.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/public/browser/content_browser_client.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc
index a9b0a79..51f3abd 100644
--- a/content/browser/utility_process_host.cc
+++ b/content/browser/utility_process_host.cc
@@ -7,8 +7,8 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/content_browser_client.h"
 #include "content/common/utility_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_switches.h"
 #include "ui/base/ui_base_switches.h"
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc
index 230911b..19c2de7 100644
--- a/content/browser/webui/web_ui_factory.cc
+++ b/content/browser/webui/web_ui_factory.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/webui/web_ui_factory.h"
 
-#include "content/browser/content_browser_client.h"
+#include "content/public/browser/content_browser_client.h"
 
 namespace content {
 
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index f04c6c8..140d272 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -18,7 +18,6 @@
 #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/content_browser_client.h"
 #include "content/browser/debugger/worker_devtools_message_filter.h"
 #include "content/browser/file_system/file_system_dispatcher_host.h"
 #include "content/browser/mime_registry_message_filter.h"
@@ -37,6 +36,7 @@
 #include "content/common/result_codes.h"
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "net/base/mime_util.h"
 #include "ipc/ipc_switches.h"
diff --git a/content/browser/zygote_host_linux.cc b/content/browser/zygote_host_linux.cc
index 7127d69..000ee29 100644
--- a/content/browser/zygote_host_linux.cc
+++ b/content/browser/zygote_host_linux.cc
@@ -24,11 +24,11 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "content/browser/content_browser_client.h"
 #include "content/browser/renderer_host/render_sandbox_host_linux.h"
 #include "content/common/process_watcher.h"
 #include "content/common/result_codes.h"
 #include "content/common/unix_domain_socket_posix.h"
+#include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_switches.h"
 #include "sandbox/linux/suid/suid_unsafe_environment_variables.h"
 
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index 073b810..b948df7 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -16,7 +16,7 @@
 #include "content/common/renderer_preferences.h"
 #include "content/common/view_message_enums.h"
 #include "content/common/webkit_param_traits.h"
-#include "content/common/window_container_type.h"
+#include "content/public/common/window_container_type.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 50964d0..5610520 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -75,7 +75,6 @@
     'browser/chrome_blob_storage_context.h',
     'browser/clipboard_dispatcher.h',
     'browser/clipboard_dispatcher.cc',
-    'browser/content_browser_client.h',
     'browser/cross_site_request_manager.cc',
     'browser/cross_site_request_manager.h',
     'browser/debugger/devtools_agent_host.cc',
@@ -561,6 +560,7 @@
     'browser/zygote_host_linux.cc',
     'browser/zygote_host_linux.h',
     'browser/zygote_main_linux.cc',
+    'public/browser/content_browser_client.h',
     'public/browser/native_web_keyboard_event.h',
     'public/browser/navigation_types.h',
     'public/browser/notification_details.h',
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 0184cce..5026187 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -245,11 +245,11 @@
     'common/webkit_param_traits.h',
     'common/webmessageportchannel_impl.cc',
     'common/webmessageportchannel_impl.h',
-    'common/window_container_type.cc',
-    'common/window_container_type.h',
     'common/worker_messages.h',
     'public/common/content_client.cc',
     'public/common/content_client.h',
+    'public/common/window_container_type.cc',
+    'public/common/window_container_type.h',
   ],
   'conditions': [
     ['OS!="win"', {
diff --git a/content/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 3508374..95f956b 100644
--- a/content/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.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 CONTENT_BROWSER_CONTENT_BROWSER_CLIENT_H_
-#define CONTENT_BROWSER_CONTENT_BROWSER_CLIENT_H_
+#ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
+#define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #pragma once
 
 #include <string>
 
 #include "base/callback.h"
-#include "content/common/window_container_type.h"
+#include "content/public/common/window_container_type.h"
 #include "content/public/common/content_client.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h"
 
@@ -348,4 +348,4 @@ class ContentBrowserClient {
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_CONTENT_BROWSER_CLIENT_H_
+#endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
diff --git a/content/common/window_container_type.cc b/content/public/common/window_container_type.cc
index 20ba687..d62a082 100644
--- a/content/common/window_container_type.cc
+++ b/content/public/common/window_container_type.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/window_container_type.h"
+#include "content/public/common/window_container_type.h"
 
 #include "base/string_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/content/common/window_container_type.h b/content/public/common/window_container_type.h
index 761f9a6..27e78b1 100644
--- a/content/common/window_container_type.h
+++ b/content/public/common/window_container_type.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_WINDOW_CONTAINER_TYPE_H_
-#define CONTENT_COMMON_WINDOW_CONTAINER_TYPE_H_
+#ifndef CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
+#define CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
 #pragma once
 
 namespace WebKit {
@@ -33,4 +33,4 @@ enum WindowContainerType {
 WindowContainerType WindowFeaturesToContainerType(
     const WebKit::WebWindowFeatures& window_features);
 
-#endif  // CONTENT_COMMON_WINDOW_CONTAINER_TYPE_H_
+#endif  // CONTENT_PUBLIC_COMMON_WINDOW_CONTAINER_TYPE_H_
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 77aa5df..ffbf826 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -10,7 +10,7 @@
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/browser/content_browser_client.h"
+#include "content/public/browser/content_browser_client.h"
 
 #if defined(OS_WIN)
 #include "content/browser/tab_contents/tab_contents_view_win_delegate.h"