Move a bunch of TabContents related files into a tab_contents subdir

Review URL: http://codereview.chromium.org/18250 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8058 0039d316-1c4b-4281-b951-d872f2087c98
author: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2009-01-15 00:59:16 +0000
committer: ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 2009-01-15 00:59:16 +0000
commit: f3ec774a2c177d3c6845553d3bf9735a7b8a5907 (patch)
tree: ed09ccf69300383bd4b2e8ac7c8b9d1bdeead07b
parent: bb515eda39129537a089a062c3db3152e63f24d9 (diff)
download: chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.zip
chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.gz
chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.bz2
175 files changed, 661 insertions, 506 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 3f058c1..24e6a4b 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/browser/alternate_nav_url_fetcher.h"
 
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 
diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h
index 7e55af7..d02480c 100644
--- a/chrome/browser/alternate_nav_url_fetcher.h
+++ b/chrome/browser/alternate_nav_url_fetcher.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/url_fetcher.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index 994315e..1cff5ee 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/controller.h"
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/url_fixer_upper.h"
diff --git a/chrome/browser/autofill_manager.cc b/chrome/browser/autofill_manager.cc
index 9493992..65396a7 100644
--- a/chrome/browser/autofill_manager.cc
+++ b/chrome/browser/autofill_manager.cc
@@ -6,7 +6,7 @@
 
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 AutofillManager::AutofillManager(WebContents* web_contents) :
     web_contents_(web_contents),
diff --git a/chrome/browser/automation/automation_constrained_window_tracker.h b/chrome/browser/automation/automation_constrained_window_tracker.h
index 0ebd96e..093fb4f 100644
--- a/chrome/browser/automation/automation_constrained_window_tracker.h
+++ b/chrome/browser/automation/automation_constrained_window_tracker.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/automation/automation_resource_tracker.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/constrained_window.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
 
 class AutomationConstrainedWindowTracker
   : public AutomationResourceTracker<ConstrainedWindow*> {
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index fcc43fa..0f12952 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -19,13 +19,13 @@
 #include "chrome/browser/external_tab_container.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/login_prompt.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/ssl_manager.h"
 #include "chrome/browser/ssl_blocking_page.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_contents_view.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/location_bar_view.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/automation/automation_tab_tracker.h b/chrome/browser/automation/automation_tab_tracker.h
index 1033ad0..a221ae4 100644
--- a/chrome/browser/automation/automation_tab_tracker.h
+++ b/chrome/browser/automation/automation_tab_tracker.h
@@ -8,7 +8,7 @@
 #include "chrome/browser/automation/automation_resource_tracker.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/notification_registrar.h"
 
 class AutomationTabTracker
diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc
index 76a6e61..2acd52e 100644
--- a/chrome/browser/back_forward_menu_model.cc
+++ b/chrome/browser/back_forward_menu_model.cc
@@ -6,9 +6,9 @@
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/history_tab_ui.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/common/l10n_util.h"
 #include "net/base/registry_controlled_domain.h"
diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/back_forward_menu_model_unittest.cc
index e194480..dbf4e4c 100644
--- a/chrome/browser/back_forward_menu_model_unittest.cc
+++ b/chrome/browser/back_forward_menu_model_unittest.cc
@@ -6,11 +6,11 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile_manager.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 const TabContentsType kHTTPTabContentsType =
diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc
index 51797ad..1d1e589 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu.cc
@@ -8,9 +8,9 @@
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/bookmarks/bookmark_context_menu_test.cc
index 3f0e063..0bec1ca 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_test.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_test.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "chrome/browser/page_navigator.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index b24b9b7..7184f3c 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/history/query_parser.h"
-#include "chrome/browser/page_navigator.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/os_exchange_data.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 0f0a099..a3cd5dd 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -26,16 +26,17 @@
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/history_tab_ui.h"
-#include "chrome/browser/interstitial_page.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/ssl_error_info.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/task_manager.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/browser/user_data_manager.h"
@@ -48,7 +49,6 @@
 #include "chrome/browser/views/select_profile_dialog.h"
 #include "chrome/browser/views/status_bubble.h"
 #include "chrome/browser/views/toolbar_star_toggle.h"
-#include "chrome/browser/web_contents_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index fa3927d..aba16c3 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -12,8 +12,8 @@
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 60b5e3d..e937d99 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -99,7 +99,7 @@ if not env.Bit('mac'):
       'printing/page_range.cc',
       'printing/page_setup.cc',
       'printing/units.cc',
-      'provisional_load_details.cc',
+      'tab_contents/provisional_load_details.cc',
       'renderer_host/async_resource_handler.cc',
       'renderer_host/buffered_resource_handler.cc',
       'renderer_host/download_resource_handler.cc',
@@ -134,7 +134,6 @@ if env.Bit('windows'):
   # TODO: Port these.
   input_files.extend([
       'autofill_manager.cc',
-      'about_internets_status_view.cc',
       'alternate_nav_url_fetcher.cc',
       'app_modal_dialog_queue.cc',
       'autocomplete/autocomplete.cc',
@@ -216,9 +215,6 @@ if env.Bit('windows'):
       'importer/ie_importer.cc',
       'importer/importer.cc',
       'importer/toolbar_importer.cc',
-      'infobar_delegate.cc',
-      'interstitial_page.cc',
-      'ipc_status_view.cc',
       'jankometer.cc',
       'js_before_unload_handler.cc',
       'jsmessage_box_handler.cc',
@@ -226,13 +222,9 @@ if env.Bit('windows'):
       'memory_details.cc',
       'metrics_service.cc',
       'modal_html_dialog_delegate.cc',
-      'native_ui_contents.cc',
-      'navigation_controller.cc',
-      'navigation_entry.cc',
       'net/dns_global.cc',
       'net/dns_master.cc',
       'net/dns_slave.cc',
-      'network_status_view.cc',
       'google_update.cc',
       'password_form_manager.cc',
       'password_manager.cc',
@@ -274,14 +266,27 @@ if env.Bit('windows'):
       'sessions/session_types.cc',
       'sessions/tab_restore_service.cc',
       'shell_integration.cc',
-      'site_instance.cc',
       'ssl_blocking_page.cc',
       'ssl_manager.cc',
       'ssl_policy.cc',
-      'status_view.cc',
-      'tab_contents.cc',
-      'tab_contents_factory.cc',
-      'tab_util.cc',
+      'tab_contents/about_internets_status_view.cc',
+      'tab_contents/infobar_delegate.cc',
+      'tab_contents/interstitial_page.cc',
+      'tab_contents/ipc_status_view.cc',
+      'tab_contents/native_ui_contents.cc',
+      'tab_contents/navigation_controller.cc',
+      'tab_contents/navigation_entry.cc',
+      'tab_contents/network_status_view.cc',
+      'tab_contents/site_instance.cc',
+      'tab_contents/status_view.cc',
+      'tab_contents/tab_contents.cc',
+      'tab_contents/tab_contents_factory.cc',
+      'tab_contents/tab_util.cc',
+      'tab_contents/view_source_contents.cc',
+      'tab_contents/web_contents.cc',
+      'tab_contents/web_contents_view.cc',
+      'tab_contents/web_drag_source.cc',
+      'tab_contents/web_drop_target.cc',
       'tabs/tab_strip_model.cc',
       'tabs/tab_strip_model_order_controller.cc',
       'task_manager.cc',
@@ -291,15 +296,10 @@ if env.Bit('windows'):
       'toolbar_model.cc',
       'url_fixer_upper.cc',
       'user_data_manager.cc',
-      'view_source_contents.cc',
       'visitedlink_master.cc',
       'web_app.cc',
       'web_app_icon_manager.cc',
       'web_app_launcher.cc',
-      'web_contents.cc',
-      'web_contents_view.cc',
-      'web_drag_source.cc',
-      'web_drop_target.cc',
       'webdata/web_data_service.cc',
       'window_sizer.cc',
   ])
@@ -310,7 +310,7 @@ if env.Bit('windows'):
       'browser_main_win.cc',
       'importer/firefox_profile_lock_win.cc',
       'render_widget_host_view_win.cc',
-      'web_contents_view_win.cc',
+      'tab_contents/web_contents_view_win.cc',
       'webdata/web_database_win.cc',
   ])
 
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 811986b..3b0348b 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -586,14 +586,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\site_instance.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\site_instance.h"
-				>
-			</File>
-			<File
 				RelativePath=".\spellcheck_worditerator.cc"
 				>
 			</File>
@@ -803,49 +795,9 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Tab Contents"
+			Name="Tab Contents (Old)"
 			>
 			<File
-				RelativePath=".\about_internets_status_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\about_internets_status_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\constrained_window.h"
-				>
-			</File>
-			<File
-				RelativePath=".\infobar_delegate.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\infobar_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ipc_status_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\ipc_status_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\network_status_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\network_status_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\page_navigator.h"
-				>
-			</File>
-			<File
 				RelativePath=".\render_view_context_menu.cc"
 				>
 			</File>
@@ -889,70 +841,6 @@
 				RelativePath=".\ssl_manager.h"
 				>
 			</File>
-			<File
-				RelativePath=".\status_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\status_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_contents.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_contents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_contents_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_contents_factory.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\tab_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\view_source_contents.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\view_source_contents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents.h"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents_view.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents_view_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\web_contents_view_win.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Browser Window"
@@ -1046,34 +934,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\navigation_controller.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\navigation_controller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\navigation_entry.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\navigation_entry.h"
-				>
-			</File>
-			<File
 				RelativePath=".\options_window.h"
 				>
 			</File>
 			<File
-				RelativePath=".\provisional_load_details.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\provisional_load_details.h"
-				>
-			</File>
-			<File
 				RelativePath=".\repost_form_warning_dialog.cc"
 				>
 			</File>
@@ -1653,22 +1517,6 @@
 				RelativePath=".\drag_utils.h"
 				>
 			</File>
-			<File
-				RelativePath=".\web_drag_source.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\web_drag_source.h"
-				>
-			</File>
-			<File
-				RelativePath=".\web_drop_target.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\web_drop_target.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Tabs"
@@ -1937,14 +1785,6 @@
 				RelativePath=".\history_tab_ui.h"
 				>
 			</File>
-			<File
-				RelativePath=".\native_ui_contents.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\native_ui_contents.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Net"
@@ -2368,6 +2208,330 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Tab Contents"
+			>
+			<File
+				RelativePath=".\tab_contents\about_internets_status_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\about_internets_status_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\constrained_window.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\infobar_delegate.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\infobar_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\interstitial_page.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\interstitial_page.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\ipc_status_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\ipc_status_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\native_ui_contents.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\native_ui_contents.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\navigation_controller.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\navigation_controller.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\navigation_entry.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\navigation_entry.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\network_status_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\network_status_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\page_navigator.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\provisional_load_details.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\provisional_load_details.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\site_instance.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\site_instance.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\status_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\status_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents_factory.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents_factory.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_contents_type.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_util.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\tab_util.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\view_source_contents.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\view_source_contents.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents_view.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents_view_win.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_contents_view_win.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_drag_source.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_drag_source.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_drop_target.cc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\$(InputName)1.obj"
+						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\tab_contents\web_drop_target.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath=".\browser_trial.cc"
 			>
@@ -2429,14 +2593,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\interstitial_page.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\interstitial_page.h"
-			>
-		</File>
-		<File
 			RelativePath=".\modal_html_dialog_delegate.cc"
 			>
 		</File>
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 0687e4f..0f4326b 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/ipc_status_view.h"
 #include "chrome/browser/memory_details.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/plugin_process_host.h"
@@ -30,6 +29,7 @@
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_view_host.h"
+#include "chrome/browser/tab_contents/ipc_status_view.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/browser_about_handler.h b/chrome/browser/browser_about_handler.h
index 8e6cf76..1d41547 100644
--- a/chrome/browser/browser_about_handler.h
+++ b/chrome/browser/browser_about_handler.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/image_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 
 class GURL;
diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc
index 13aa318..6029577 100644
--- a/chrome/browser/browser_commands_unittest.cc
+++ b/chrome/browser/browser_commands_unittest.cc
@@ -5,8 +5,8 @@
 #include "chrome/app/chrome_dll_resource.h" 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/test/browser_with_test_window_test.h"
 
 typedef BrowserWithTestWindowTest BrowserCommandsTest;
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 0d6d128..24a77f2 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -24,11 +24,11 @@
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/infobar_delegate.h"
-#include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/sessions/session_restore.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/browser/web_app_launcher.h"
diff --git a/chrome/browser/browser_list.cc b/chrome/browser/browser_list.cc
index 2665daa..7a09d96 100644
--- a/chrome/browser/browser_list.cc
+++ b/chrome/browser/browser_list.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/views/window.h"
 
diff --git a/chrome/browser/browser_prefs.cc b/chrome/browser/browser_prefs.cc
index a982561..6946fa8 100644
--- a/chrome/browser/browser_prefs.cc
+++ b/chrome/browser/browser_prefs.cc
@@ -26,7 +26,7 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/page_info_window.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 namespace browser {
 
diff --git a/chrome/browser/browsing_instance.cc b/chrome/browser/browsing_instance.cc
index 542b4c0..527feb1a 100644
--- a/chrome/browser/browsing_instance.cc
+++ b/chrome/browser/browsing_instance.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/browsing_instance.h"
 
 #include "base/command_line.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_switches.h"
 
 /*static*/
diff --git a/chrome/browser/cert_store.cc b/chrome/browser/cert_store.cc
index 542b3d8..035fc66 100644
--- a/chrome/browser/cert_store.cc
+++ b/chrome/browser/cert_store.cc
@@ -8,7 +8,7 @@
 #include <functional>
 
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/stl_util-inl.h"
 
 template <typename T>
diff --git a/chrome/browser/debugger/debugger_host_impl.cpp b/chrome/browser/debugger/debugger_host_impl.cpp
index 32c13fd..0d39964 100644
--- a/chrome/browser/debugger/debugger_host_impl.cpp
+++ b/chrome/browser/debugger/debugger_host_impl.cpp
@@ -9,7 +9,7 @@
 #include "chrome/browser/debugger/debugger_io.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/notification_service.h"
 
 class TabContentsReference : public NotificationObserver {
diff --git a/chrome/browser/debugger/debugger_node.cc b/chrome/browser/debugger/debugger_node.cc
index de5d3a6..32e7afd 100644
--- a/chrome/browser/debugger/debugger_node.cc
+++ b/chrome/browser/debugger/debugger_node.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/debugger/debugger_shell.h"
 
 DebuggerNode::DebuggerNode() : valid_(true), observing_(false), data_(NULL) {
diff --git a/chrome/browser/debugger/debugger_shell.cc b/chrome/browser/debugger/debugger_shell.cc
index 9858613..b64f083 100644
--- a/chrome/browser/debugger/debugger_shell.cc
+++ b/chrome/browser/debugger/debugger_shell.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/debugger/debugger_node.h"
 #include "chrome/browser/debugger/resources/debugger_resources.h"
 #include "chrome/browser/render_process_host.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/resource_bundle.h"
 
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc
index 530ffbf..97cb229 100644
--- a/chrome/browser/debugger/debugger_view.cc
+++ b/chrome/browser/debugger/debugger_view.cc
@@ -16,11 +16,11 @@
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/grid_layout.h"
diff --git a/chrome/browser/debugger/debugger_view.h b/chrome/browser/debugger/debugger_view.h
index 9603777..6c6457e 100644
--- a/chrome/browser/debugger/debugger_view.h
+++ b/chrome/browser/debugger/debugger_view.h
@@ -11,7 +11,7 @@
 #define CHROME_BROWSER_DEBUGGER_DEBUGGER_VIEW_H__
 
 #include "base/gfx/size.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/views/view.h"
 #include "chrome/views/text_field.h"
 
diff --git a/chrome/browser/debugger/debugger_window.cc b/chrome/browser/debugger/debugger_window.cc
index e340bff..36ebf69 100644
--- a/chrome/browser/debugger/debugger_window.cc
+++ b/chrome/browser/debugger/debugger_window.cc
@@ -4,12 +4,12 @@
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/constrained_window.h"
 #include "chrome/browser/debugger/debugger_host_impl.h"
 #include "chrome/browser/debugger/debugger_view.h"
 #include "chrome/browser/debugger/debugger_window.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "generated_resources.h"
 
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index 3001c9e..1f6f220 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -6,8 +6,8 @@
 
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/history_ui.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/resource_bundle.h"
 
 // The scheme used for DOMUIContentses
diff --git a/chrome/browser/dom_ui/dom_ui_contents.h b/chrome/browser/dom_ui/dom_ui_contents.h
index c347c07..4712552 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.h
+++ b/chrome/browser/dom_ui/dom_ui_contents.h
@@ -8,7 +8,7 @@
 #define CHROME_BROWSER_DOM_UI_CONTENTS_H__
 
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "webkit/glue/webpreferences.h"
 
 class DOMUI;
diff --git a/chrome/browser/dom_ui/dom_ui_host.cc b/chrome/browser/dom_ui/dom_ui_host.cc
index ff2ca1e..91ba5f5 100644
--- a/chrome/browser/dom_ui/dom_ui_host.cc
+++ b/chrome/browser/dom_ui/dom_ui_host.cc
@@ -7,8 +7,8 @@
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/tab_contents_type.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/browser/render_view_host.h"
 
 DOMUIHost::DOMUIHost(Profile* profile,
diff --git a/chrome/browser/dom_ui/dom_ui_host.h b/chrome/browser/dom_ui/dom_ui_host.h
index 408e62c..4ae5e86 100644
--- a/chrome/browser/dom_ui/dom_ui_host.h
+++ b/chrome/browser/dom_ui/dom_ui_host.h
@@ -12,7 +12,7 @@
 #ifndef CHROME_BROWSER_DOM_UI_DOM_UI_HOST_H__
 #define CHROME_BROWSER_DOM_UI_DOM_UI_HOST_H__
 
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "webkit/glue/webpreferences.h"
 
 class DOMMessageDispatcher;
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index d47bdaa..9b7107a 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/history/page_usage_data.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/user_metrics.h"
diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index da4c3b1..70d733d 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 199b8df..1abfb87 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -25,8 +25,8 @@
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/download/download_request_manager.cc b/chrome/browser/download/download_request_manager.cc
index ac4cdb5..9410cd3 100644
--- a/chrome/browser/download/download_request_manager.cc
+++ b/chrome/browser/download/download_request_manager.cc
@@ -6,12 +6,12 @@
 
 #include "base/message_loop.h"
 #include "base/thread.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/constrained_window.h"
-#include "chrome/browser/tab_contents_delegate.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/download/download_request_manager_unittest.cc b/chrome/browser/download/download_request_manager_unittest.cc
index 14ba6be..61da19e 100644
--- a/chrome/browser/download/download_request_manager_unittest.cc
+++ b/chrome/browser/download/download_request_manager_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/test/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/download/save_file_manager.cc b/chrome/browser/download/save_file_manager.cc
index 41607ea..fbf5782 100644
--- a/chrome/browser/download/save_file_manager.cc
+++ b/chrome/browser/download/save_file_manager.cc
@@ -16,9 +16,9 @@
 #include "chrome/browser/download/save_file.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index f8b85af..c32c5ca 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -22,8 +22,8 @@
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc
index db81e93..20c8424 100644
--- a/chrome/browser/encoding_menu_controller_delegate.cc
+++ b/chrome/browser/encoding_menu_controller_delegate.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index b074746..bc40c4f 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -8,9 +8,9 @@
 #include "base/win_util.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents_container_view.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/win_util.h"
 // Included for SetRootViewForHWND.
diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h
index bd9ab4c..b335f13 100644
--- a/chrome/browser/external_tab_container.h
+++ b/chrome/browser/external_tab_container.h
@@ -11,7 +11,7 @@
 #include <atlmisc.h>
 
 #include "base/basictypes.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index 63f39e3..2f5bd97 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -6,11 +6,11 @@
 
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/tab_contents_delegate.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "skia/ext/image_operations.h"
 
diff --git a/chrome/browser/history_tab_ui.h b/chrome/browser/history_tab_ui.h
index a99039e..927ad5b 100644
--- a/chrome/browser/history_tab_ui.h
+++ b/chrome/browser/history_tab_ui.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_HISTORY_TAB_UI_H__
 #define CHROME_BROWSER_HISTORY_TAB_UI_H__
 
-#include "chrome/browser/native_ui_contents.h"
+#include "chrome/browser/tab_contents/native_ui_contents.h"
 
 class BaseHistoryModel;
 class HistoryView;
diff --git a/chrome/browser/history_view.cc b/chrome/browser/history_view.cc
index c382226..15274a5 100644
--- a/chrome/browser/history_view.cc
+++ b/chrome/browser/history_view.cc
@@ -9,8 +9,8 @@
 #include "base/word_iterator.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/browser/native_ui_contents.h"
-#include "chrome/browser/page_navigator.h"
+#include "chrome/browser/tab_contents/native_ui_contents.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/bookmark_bubble_view.h"
 #include "chrome/browser/views/event_utils.h"
diff --git a/chrome/browser/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc
index 2a1d2fd..47b0998 100644
--- a/chrome/browser/jsmessage_box_handler.cc
+++ b/chrome/browser/jsmessage_box_handler.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/app_modal_dialog_queue.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/load_notification_details.h b/chrome/browser/load_notification_details.h
index 6524399..7c46e87 100644
--- a/chrome/browser/load_notification_details.h
+++ b/chrome/browser/load_notification_details.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/time.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc
index 24fd24f..3910019 100644
--- a/chrome/browser/login_prompt.cc
+++ b/chrome/browser/login_prompt.cc
@@ -8,14 +8,14 @@
 #include "base/lock.h"
 #include "base/message_loop.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/constrained_window.h"
 #include "chrome/browser/controller.h"
-#include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/password_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/tab_util.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 0ad784d..cc762f1 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -17,8 +17,8 @@
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 class RenderViewHostDelegate;
 
diff --git a/chrome/browser/navigation_controller_unittest.cc b/chrome/browser/navigation_controller_unittest.cc
index 8ffd331..09c93e6 100644
--- a/chrome/browser/navigation_controller_unittest.cc
+++ b/chrome/browser/navigation_controller_unittest.cc
@@ -5,16 +5,16 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_delegate.h"
-#include "chrome/browser/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_types.h"
 #include "chrome/common/stl_util-inl.h"
diff --git a/chrome/browser/password_manager.cc b/chrome/browser/password_manager.cc
index 8779209..fa19f62 100644
--- a/chrome/browser/password_manager.cc
+++ b/chrome/browser/password_manager.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/password_manager.h b/chrome/browser/password_manager.h
index a1e28eb..dd9a953 100644
--- a/chrome/browser/password_manager.h
+++ b/chrome/browser/password_manager.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_PASSWORD_MANAGER_H__
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/infobar_delegate.h"
 #include "chrome/browser/password_form_manager.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/views/login_view.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/stl_util-inl.h"
diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc
index 683c77a..7d06128 100644
--- a/chrome/browser/plugin_installer.cc
+++ b/chrome/browser/plugin_installer.cc
@@ -6,7 +6,7 @@
 
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
diff --git a/chrome/browser/plugin_installer.h b/chrome/browser/plugin_installer.h
index 2ba3424..9e11178 100644
--- a/chrome/browser/plugin_installer.h
+++ b/chrome/browser/plugin_installer.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_PLUGIN_INSTALLER_H_
 #define CHROME_BROWSER_PLUGIN_INSTALLER_H_
 
-#include "chrome/browser/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 
 class WebContents;
 
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index 9771389..9ae2efb 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/printing/print_view_manager.h"
 
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/printed_document.h"
 #include "chrome/browser/printing/printer_query.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/emf.h"
 #include "chrome/common/l10n_util.h"
 
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index b1762f0..a849bf1 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -20,13 +20,13 @@
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/spellchecker.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/template_url_fetcher.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/visitedlink_master.h"
diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index 23ad108..fab4dd45 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/render_process_host.cc b/chrome/browser/render_process_host.cc
index 4adaff1..a0a8f8b 100644
--- a/chrome/browser/render_process_host.cc
+++ b/chrome/browser/render_process_host.cc
@@ -40,7 +40,7 @@
 #include "chrome/browser/sandbox_policy.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/visitedlink_master.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/render_view_context_menu_controller.cc
index 522ebe0..7a75577 100644
--- a/chrome/browser/render_view_context_menu_controller.cc
+++ b/chrome/browser/render_view_context_menu_controller.cc
@@ -17,12 +17,12 @@
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/save_package.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/views/page_info_window.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/clipboard_service.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/render_view_host.cc
index 6fa62b8..5ace177 100644
--- a/chrome/browser/render_view_host.cc
+++ b/chrome/browser/render_view_host.cc
@@ -11,17 +11,17 @@
 #include "chrome/app/result_codes.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cross_site_request_manager.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/render_widget_host.h"
 #include "chrome/browser/render_widget_host_view.h"
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/renderer_security_policy.h"
-#include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/user_metrics.h"
-#include "chrome/browser/web_contents.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/thumbnail_score.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/render_view_host_manager.cc b/chrome/browser/render_view_host_manager.cc
index c5e4d00..f7edacf 100644
--- a/chrome/browser/render_view_host_manager.cc
+++ b/chrome/browser/render_view_host_manager.cc
@@ -6,12 +6,12 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_widget_host_view.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_view_host_delegate.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 
diff --git a/chrome/browser/renderer_host/cross_site_resource_handler.cc b/chrome/browser/renderer_host/cross_site_resource_handler.cc
index d597732..91695df 100644
--- a/chrome/browser/renderer_host/cross_site_resource_handler.cc
+++ b/chrome/browser/renderer_host/cross_site_resource_handler.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 namespace {
 // Task to notify the WebContents that a cross-site response has begun, so that
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index c591ee6..7c74420 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -32,8 +32,8 @@
 #include "chrome/browser/renderer_security_policy.h"
 #include "chrome/browser/resource_request_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_types.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/repost_form_warning_dialog.cc b/chrome/browser/repost_form_warning_dialog.cc
index c030265..8a88a79 100644
--- a/chrome/browser/repost_form_warning_dialog.cc
+++ b/chrome/browser/repost_form_warning_dialog.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/repost_form_warning_dialog.h"
 
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/message_box_view.h"
 #include "chrome/views/window.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 265e4c7..4d34450 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -12,11 +12,11 @@
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/google_util.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
index b0fa2ea..7b94290 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.h
@@ -22,7 +22,7 @@
 #define CHROME_BROWSER_SAFE_BROWSING_SAFE_BROWSING_BLOCKING_PAGE_H_
 
 #include "base/logging.h"
-#include "chrome/browser/interstitial_page.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc
index d86d219..60da2b5 100644
--- a/chrome/browser/safe_browsing/safe_browsing_service.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_service.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/safe_browsing/protocol_manager.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/browser/safe_browsing/safe_browsing_database.h"
-#include "chrome/browser/tab_util.h"
+#include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/sessions/base_session_service.cc b/chrome/browser/sessions/base_session_service.cc
index b26f7e0..4bb9101 100644
--- a/chrome/browser/sessions/base_session_service.cc
+++ b/chrome/browser/sessions/base_session_service.cc
@@ -7,11 +7,11 @@
 #include "base/pickle.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/stl_util-inl.h"
 
 // InternalGetCommandsRequest -------------------------------------------------
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index 8ffbac9..dfb5acd 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -10,11 +10,11 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_controller.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 
diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc
index 227c6ff..4f5861e 100644
--- a/chrome/browser/sessions/session_service.cc
+++ b/chrome/browser/sessions/session_service.cc
@@ -14,14 +14,14 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_restore.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_types.h"
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 1939c7e..059f307e 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -6,11 +6,11 @@
 
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_test_helper.h"
 #include "chrome/browser/sessions/session_types.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/scoped_vector.h"
 #include "chrome/common/stl_util-inl.h"
diff --git a/chrome/browser/sessions/session_types.cc b/chrome/browser/sessions/session_types.cc
index 5c17454..a43f637 100644
--- a/chrome/browser/sessions/session_types.cc
+++ b/chrome/browser/sessions/session_types.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/sessions/session_types.h"
 
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 
 // TabNavigation --------------------------------------------------------------
 
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 13da68f..a6b3968 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -8,11 +8,11 @@
 #include "chrome/browser/sessions/tab_restore_service.h"
 
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_backend.h"
 #include "chrome/browser/sessions/session_service.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/scoped_vector.h"
 #include "chrome/common/stl_util-inl.h"
 
diff --git a/chrome/browser/sessions/tab_restore_service_unittest.cc b/chrome/browser/sessions/tab_restore_service_unittest.cc
index 2f7d4ba..bc5aefc 100644
--- a/chrome/browser/sessions/tab_restore_service_unittest.cc
+++ b/chrome/browser/sessions/tab_restore_service_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/test/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/site_instance_unittest.cc b/chrome/browser/site_instance_unittest.cc
index dc0297e..16e6883 100644
--- a/chrome/browser/site_instance_unittest.cc
+++ b/chrome/browser/site_instance_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ssl_blocking_page.cc b/chrome/browser/ssl_blocking_page.cc
index 88b402c..67ea40a 100644
--- a/chrome/browser/ssl_blocking_page.cc
+++ b/chrome/browser/ssl_blocking_page.cc
@@ -9,10 +9,10 @@
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/ssl_error_info.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ssl_blocking_page.h b/chrome/browser/ssl_blocking_page.h
index 0b4e9c6..69472fa 100644
--- a/chrome/browser/ssl_blocking_page.h
+++ b/chrome/browser/ssl_blocking_page.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/interstitial_page.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/ssl_manager.h"
 #include "chrome/views/decision.h"
 
diff --git a/chrome/browser/ssl_manager.cc b/chrome/browser/ssl_manager.cc
index 5ff8778..a91b248 100644
--- a/chrome/browser/ssl_manager.cc
+++ b/chrome/browser/ssl_manager.cc
@@ -8,19 +8,19 @@
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/provisional_load_details.h"
-#include "chrome/browser/infobar_delegate.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/resource_request_details.h"
 #include "chrome/browser/ssl_error_info.h"
 #include "chrome/browser/ssl_policy.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/provisional_load_details.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/ssl_manager.h b/chrome/browser/ssl_manager.h
index 9434a4b..e650b35 100644
--- a/chrome/browser/ssl_manager.h
+++ b/chrome/browser/ssl_manager.h
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/provisional_load_details.h"
-#include "chrome/browser/security_style.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+#include "chrome/browser/security_style.h"
+#include "chrome/browser/tab_contents/provisional_load_details.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/ssl_policy.cc b/chrome/browser/ssl_policy.cc
index f89cdcd..ea92e37 100644
--- a/chrome/browser/ssl_policy.cc
+++ b/chrome/browser/ssl_policy.cc
@@ -9,11 +9,11 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/cert_store.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/ssl_error_info.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/about_internets_status_view.cc b/chrome/browser/tab_contents/about_internets_status_view.cc
index 36c8cfa..46cf931 100644
--- a/chrome/browser/about_internets_status_view.cc
+++ b/chrome/browser/tab_contents/about_internets_status_view.cc
@@ -5,8 +5,8 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
-#include "chrome/browser/about_internets_status_view.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/about_internets_status_view.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 
 AboutInternetsStatusView::AboutInternetsStatusView()
     : StatusView(TAB_CONTENTS_ABOUT_INTERNETS_STATUS_VIEW) {}
diff --git a/chrome/browser/about_internets_status_view.h b/chrome/browser/tab_contents/about_internets_status_view.h
index dd33a21..5d7498e 100644
--- a/chrome/browser/about_internets_status_view.h
+++ b/chrome/browser/tab_contents/about_internets_status_view.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_ABOUT_INTERNETS_STATUS_VIEW_H__
 
 #include "base/scoped_handle.h"
-#include "chrome/browser/status_view.h"
+#include "chrome/browser/tab_contents/status_view.h"
 
 // Displays sspipes.scr in the content HWND.
 class AboutInternetsStatusView : public StatusView {
diff --git a/chrome/browser/constrained_window.h b/chrome/browser/tab_contents/constrained_window.h
index d703ad2..d703ad2 100644
--- a/chrome/browser/constrained_window.h
+++ b/chrome/browser/tab_contents/constrained_window.h
diff --git a/chrome/browser/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index 44e9cc4..eaeb013 100644
--- a/chrome/browser/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.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/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 
 #include "base/logging.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
 
 #include "generated_resources.h"
diff --git a/chrome/browser/infobar_delegate.h b/chrome/browser/tab_contents/infobar_delegate.h
index 523bc20..07f225b 100644
--- a/chrome/browser/infobar_delegate.h
+++ b/chrome/browser/tab_contents/infobar_delegate.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 #include "skia/include/SkBitmap.h"
 
 class AlertInfoBarDelegate;
diff --git a/chrome/browser/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index fb69929..ca0f226 100644
--- a/chrome/browser/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -2,17 +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/interstitial_page.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_widget_host_view_win.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_contents_view_win.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view_win.h"
 #include "chrome/views/window.h"
 #include "chrome/views/window_delegate.h"
 #include "net/base/escape.h"
diff --git a/chrome/browser/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 6c2c76f5..6c2c76f5 100644
--- a/chrome/browser/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
diff --git a/chrome/browser/ipc_status_view.cc b/chrome/browser/tab_contents/ipc_status_view.cc
index 4e0e2a5..1385898 100644
--- a/chrome/browser/ipc_status_view.cc
+++ b/chrome/browser/tab_contents/ipc_status_view.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/ipc_status_view.h"
+#include "chrome/browser/tab_contents/ipc_status_view.h"
 
 #include <stdio.h>
 
diff --git a/chrome/browser/ipc_status_view.h b/chrome/browser/tab_contents/ipc_status_view.h
index b2b7d5a..790516d 100644
--- a/chrome/browser/ipc_status_view.h
+++ b/chrome/browser/tab_contents/ipc_status_view.h
@@ -8,7 +8,7 @@
 #include <set>
 
 #include "base/basictypes.h"
-#include "chrome/browser/status_view.h"
+#include "chrome/browser/tab_contents/status_view.h"
 #include "chrome/common/ipc_logging.h"
 #include "chrome/common/ipc_message_utils.h"
 
diff --git a/chrome/browser/native_ui_contents.cc b/chrome/browser/tab_contents/native_ui_contents.cc
index d8098bb..9ff65ce 100644
--- a/chrome/browser/native_ui_contents.cc
+++ b/chrome/browser/tab_contents/native_ui_contents.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/native_ui_contents.h"
+#include "chrome/browser/tab_contents/native_ui_contents.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/history_tab_ui.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/views/download_tab_view.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/browser/native_ui_contents.h b/chrome/browser/tab_contents/native_ui_contents.h
index 09c9750..decf123 100644
--- a/chrome/browser/native_ui_contents.h
+++ b/chrome/browser/tab_contents/native_ui_contents.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_NATIVE_UI_CONTENTS_H__
 
 #include "chrome/browser/page_state.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/views/background.h"
 #include "chrome/views/link.h"
 #include "chrome/views/native_button.h"
diff --git a/chrome/browser/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index c5373aa..e9dd832 100644
--- a/chrome/browser/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.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/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ -10,13 +10,13 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/repost_form_warning_dialog.h"
 #include "chrome/browser/sessions/session_types.h"
-#include "chrome/browser/site_instance.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/resource_bundle.h"
diff --git a/chrome/browser/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index ce5a20f..dac0a37 100644
--- a/chrome/browser/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -10,9 +10,9 @@
 #include "base/linked_ptr.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/sessions/session_id.h"
-#include "chrome/browser/site_instance.h"
 #include "chrome/browser/ssl_manager.h"
-#include "chrome/browser/tab_contents_type.h"
+#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/common/navigation_types.h"
 
 class GURL;
diff --git a/chrome/browser/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index ca64e28..bf0951c 100644
--- a/chrome/browser/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.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/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 
 #include "chrome/common/resource_bundle.h"
 
diff --git a/chrome/browser/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 8fc2738..3ffbfdb 100644
--- a/chrome/browser/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -9,8 +9,8 @@
 #include "base/scoped_ptr.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/security_style.h"
-#include "chrome/browser/site_instance.h"
-#include "chrome/browser/tab_contents_type.h"
+#include "chrome/browser/tab_contents/site_instance.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "skia/include/SkBitmap.h"
diff --git a/chrome/browser/network_status_view.cc b/chrome/browser/tab_contents/network_status_view.cc
index 74fff7f..2061ffe 100644
--- a/chrome/browser/network_status_view.cc
+++ b/chrome/browser/tab_contents/network_status_view.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/network_status_view.h"
+#include "chrome/browser/tab_contents/network_status_view.h"
 
 #include <stdio.h>
 
@@ -10,7 +10,7 @@
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/views/root_view.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
diff --git a/chrome/browser/network_status_view.h b/chrome/browser/tab_contents/network_status_view.h
index 2170f73..5d6f53a9 100644
--- a/chrome/browser/network_status_view.h
+++ b/chrome/browser/tab_contents/network_status_view.h
@@ -9,7 +9,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/browser/status_view.h"
+#include "chrome/browser/tab_contents/status_view.h"
 #include "net/url_request/url_request_job_tracker.h"
 
 class MessageLoop;
diff --git a/chrome/browser/page_navigator.h b/chrome/browser/tab_contents/page_navigator.h
index 0152d39..0152d39 100644
--- a/chrome/browser/page_navigator.h
+++ b/chrome/browser/tab_contents/page_navigator.h
diff --git a/chrome/browser/provisional_load_details.cc b/chrome/browser/tab_contents/provisional_load_details.cc
index fcd1558..1ec1206 100644
--- a/chrome/browser/provisional_load_details.cc
+++ b/chrome/browser/tab_contents/provisional_load_details.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 
-#include "chrome/browser/provisional_load_details.h"
+#include "chrome/browser/tab_contents/provisional_load_details.h"
 
 #include "chrome/browser/ssl_manager.h"
 
diff --git a/chrome/browser/provisional_load_details.h b/chrome/browser/tab_contents/provisional_load_details.h
index 5cb9501..5cb9501 100644
--- a/chrome/browser/provisional_load_details.h
+++ b/chrome/browser/tab_contents/provisional_load_details.h
diff --git a/chrome/browser/site_instance.cc b/chrome/browser/tab_contents/site_instance.cc
index ec1eaf1..a303f85 100644
--- a/chrome/browser/site_instance.cc
+++ b/chrome/browser/tab_contents/site_instance.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/site_instance.h"
+#include "chrome/browser/tab_contents/site_instance.h"
 
 #include "net/base/registry_controlled_domain.h"
 
diff --git a/chrome/browser/site_instance.h b/chrome/browser/tab_contents/site_instance.h
index 6759fe3..6759fe3 100644
--- a/chrome/browser/site_instance.h
+++ b/chrome/browser/tab_contents/site_instance.h
diff --git a/chrome/browser/status_view.cc b/chrome/browser/tab_contents/status_view.cc
index 30395fc..349ac53 100644
--- a/chrome/browser/status_view.cc
+++ b/chrome/browser/tab_contents/status_view.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/status_view.h"
+#include "chrome/browser/tab_contents/status_view.h"
 
 const int StatusView::kLayoutPadding = 5;
 const int StatusView::kButtonWidth = 200;
diff --git a/chrome/browser/status_view.h b/chrome/browser/tab_contents/status_view.h
index 7184ba5..e1f0204 100644
--- a/chrome/browser/status_view.h
+++ b/chrome/browser/tab_contents/status_view.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 
 typedef CWinTraits<WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS>
     StatusViewTraits;
diff --git a/chrome/browser/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 9507cd4..70988e2 100644
--- a/chrome/browser/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -2,16 +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/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 
 #include "chrome/browser/cert_store.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/infobar_delegate.h"
 #include "chrome/browser/views/download_shelf_view.h"
 #include "chrome/browser/views/download_started_animation.h"
 #include "chrome/browser/views/blocked_popup_container.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h
index 833939b..41ef34a 100644
--- a/chrome/browser/tab_contents.h
+++ b/chrome/browser/tab_contents/tab_contents.h
@@ -9,11 +9,11 @@
 #include <vector>
 
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
-#include "chrome/browser/constrained_window.h"
-#include "chrome/browser/infobar_delegate.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/page_navigator.h"
-#include "chrome/browser/tab_contents_type.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/property_bag.h"
diff --git a/chrome/browser/tab_contents_delegate.h b/chrome/browser/tab_contents/tab_contents_delegate.h
index 58cf471..773bb41 100644
--- a/chrome/browser/tab_contents_delegate.h
+++ b/chrome/browser/tab_contents/tab_contents_delegate.h
@@ -8,7 +8,7 @@
 // TODO(maruel):  Remove once UINT and HWND are replaced / typedef.
 #include <windows.h>
 
-#include "chrome/browser/page_navigator.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/common/navigation_types.h"
 
 namespace gfx {
diff --git a/chrome/browser/tab_contents_factory.cc b/chrome/browser/tab_contents/tab_contents_factory.cc
index 6a6abba..5151555 100644
--- a/chrome/browser/tab_contents_factory.cc
+++ b/chrome/browser/tab_contents/tab_contents_factory.cc
@@ -2,24 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/tab_contents.h"
-
-#include "chrome/browser/about_internets_status_view.h"
+#include "base/string_util.h"
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_url_handler.h"
 #include "chrome/browser/dom_ui/dom_ui_contents.h"
 #include "chrome/browser/dom_ui/html_dialog_contents.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/ipc_status_view.h"
-#include "chrome/browser/native_ui_contents.h"
-#include "chrome/browser/network_status_view.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/debugger/debugger_contents.h"
-#include "chrome/browser/tab_contents_factory.h"
-#include "chrome/browser/view_source_contents.h"
-#include "chrome/browser/web_contents.h"
-#include "base/string_util.h"
+#include "chrome/browser/tab_contents/about_internets_status_view.h"
+#include "chrome/browser/tab_contents/ipc_status_view.h"
+#include "chrome/browser/tab_contents/native_ui_contents.h"
+#include "chrome/browser/tab_contents/network_status_view.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/view_source_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "net/base/net_util.h"
 
 typedef std::map<TabContentsType, TabContentsFactory*> TabContentsFactoryMap;
diff --git a/chrome/browser/tab_contents_factory.h b/chrome/browser/tab_contents/tab_contents_factory.h
index 86c15ea..615c01d 100644
--- a/chrome/browser/tab_contents_factory.h
+++ b/chrome/browser/tab_contents/tab_contents_factory.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_TAB_CONTENTS_FACTORY_H_
 
 #include <string>
-#include "chrome/browser/tab_contents_type.h"
+#include "chrome/browser/tab_contents/tab_contents_type.h"
 
 class TabContents;
 
diff --git a/chrome/browser/tab_contents_type.h b/chrome/browser/tab_contents/tab_contents_type.h
index 86f38cc..86f38cc 100644
--- a/chrome/browser/tab_contents_type.h
+++ b/chrome/browser/tab_contents/tab_contents_type.h
diff --git a/chrome/browser/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index ecb7c84..a1a2f4e 100644
--- a/chrome/browser/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.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/tab_util.h"
+#include "chrome/browser/tab_contents/tab_util.h"
 
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "net/url_request/url_request.h"
 
 bool tab_util::GetTabContentsID(URLRequest* request,
diff --git a/chrome/browser/tab_util.h b/chrome/browser/tab_contents/tab_util.h
index 6aa96f3..6aa96f3 100644
--- a/chrome/browser/tab_util.h
+++ b/chrome/browser/tab_contents/tab_util.h
diff --git a/chrome/browser/view_source_contents.cc b/chrome/browser/tab_contents/view_source_contents.cc
index 6ba3fc7..849a005 100644
--- a/chrome/browser/view_source_contents.cc
+++ b/chrome/browser/tab_contents/view_source_contents.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/view_source_contents.h"
+#include "chrome/browser/tab_contents/view_source_contents.h"
 
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 
 ViewSourceContents::ViewSourceContents(Profile* profile, SiteInstance* instance)
diff --git a/chrome/browser/view_source_contents.h b/chrome/browser/tab_contents/view_source_contents.h
index c10975a..baeade6 100644
--- a/chrome/browser/view_source_contents.h
+++ b/chrome/browser/tab_contents/view_source_contents.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEW_SOURCE_CONTENTS_H__
 #define CHROME_BROWSER_VIEW_SOURCE_CONTENTS_H__
 
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 // We use this class to implement view-source: URLs.
 class ViewSourceContents : public WebContents {
diff --git a/chrome/browser/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc
index 73cc875..73cc875 100644
--- a/chrome/browser/view_source_uitest.cc
+++ b/chrome/browser/tab_contents/view_source_uitest.cc
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 90f6491..512c35a 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.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/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ -24,18 +24,18 @@
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/modal_html_dialog_delegate.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view_win.h"  // TODO(brettw) delete me.
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
+#include "chrome/browser/tab_contents/web_contents_view_win.h"
 #include "chrome/browser/template_url_fetcher.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/views/hung_renderer_view.h"  // TODO(brettw) delete me.
-#include "chrome/browser/web_contents_view.h"
-#include "chrome/browser/web_contents_view_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/web_contents.h b/chrome/browser/tab_contents/web_contents.h
index 1ac6a56..7b44e79 100644
--- a/chrome/browser/web_contents.h
+++ b/chrome/browser/tab_contents/web_contents.h
@@ -12,7 +12,7 @@
 #include "chrome/browser/render_view_host_delegate.h"
 #include "chrome/browser/render_view_host_manager.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/web_app.h"
 
 class AutofillManager;
diff --git a/chrome/browser/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index c3ba13e..df018c1 100644
--- a/chrome/browser/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -3,12 +3,12 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "chrome/browser/interstitial_page.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/ipc_channel.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/web_contents_view.cc b/chrome/browser/tab_contents/web_contents_view.cc
index 3860fdf..d95fd78 100644
--- a/chrome/browser/web_contents_view.cc
+++ b/chrome/browser/tab_contents/web_contents_view.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/web_contents_view.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 
 #include "chrome/browser/render_widget_host.h"
 
diff --git a/chrome/browser/web_contents_view.h b/chrome/browser/tab_contents/web_contents_view.h
index 232b449..232b449 100644
--- a/chrome/browser/web_contents_view.h
+++ b/chrome/browser/tab_contents/web_contents_view.h
diff --git a/chrome/browser/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc
index 525ea4a..ab244cc 100644
--- a/chrome/browser/web_contents_view_win.cc
+++ b/chrome/browser/tab_contents/web_contents_view_win.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/web_contents_view_win.h"
+#include "chrome/browser/tab_contents/web_contents_view_win.h"
 
 #include <windows.h>
 
@@ -10,17 +10,17 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/browser/interstitial_page.h"
 #include "chrome/browser/render_view_context_menu.h"
 #include "chrome/browser/render_view_context_menu_controller.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view_win.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/interstitial_page.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_drag_source.h"
+#include "chrome/browser/tab_contents/web_drop_target.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/browser/views/sad_tab_view.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_drag_source.h"
-#include "chrome/browser/web_drop_target.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/os_exchange_data.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
diff --git a/chrome/browser/web_contents_view_win.h b/chrome/browser/tab_contents/web_contents_view_win.h
index 604c462..137674a 100644
--- a/chrome/browser/web_contents_view_win.h
+++ b/chrome/browser/tab_contents/web_contents_view_win.h
@@ -7,7 +7,7 @@
 
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/web_contents_view.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/views/widget_win.h"
 
 class FindBarWin;
diff --git a/chrome/browser/web_drag_source.cc b/chrome/browser/tab_contents/web_drag_source.cc
index 9a197ae..b47913b 100644
--- a/chrome/browser/web_drag_source.cc
+++ b/chrome/browser/tab_contents/web_drag_source.cc
@@ -6,7 +6,7 @@
 #include <atlapp.h>
 #include <atlmisc.h>
 
-#include "chrome/browser/web_drag_source.h"
+#include "chrome/browser/tab_contents/web_drag_source.h"
 
 #include "chrome/browser/render_view_host.h"
 
diff --git a/chrome/browser/web_drag_source.h b/chrome/browser/tab_contents/web_drag_source.h
index f8aa628..f8aa628 100644
--- a/chrome/browser/web_drag_source.h
+++ b/chrome/browser/tab_contents/web_drag_source.h
diff --git a/chrome/browser/web_drop_target.cc b/chrome/browser/tab_contents/web_drop_target.cc
index fe5ee53..c3220e5 100644
--- a/chrome/browser/web_drop_target.cc
+++ b/chrome/browser/tab_contents/web_drop_target.cc
@@ -5,12 +5,12 @@
 #include <windows.h>
 #include <shlobj.h>
 
-#include "chrome/browser/web_drop_target.h"
+#include "chrome/browser/tab_contents/web_drop_target.h"
 
 #include "base/clipboard_util.h"
 #include "base/gfx/point.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/os_exchange_data.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/web_drop_target.h b/chrome/browser/tab_contents/web_drop_target.h
index 28f4073..28f4073 100644
--- a/chrome/browser/web_drop_target.h
+++ b/chrome/browser/tab_contents/web_drop_target.h
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 3658ef5..2e42a64 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -10,11 +10,11 @@
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
-#include "chrome/browser/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 #include "chrome/browser/user_metrics.h"
diff --git a/chrome/browser/tabs/tab_strip_model.h b/chrome/browser/tabs/tab_strip_model.h
index d5d56f2..0e5ceea 100644
--- a/chrome/browser/tabs/tab_strip_model.h
+++ b/chrome/browser/tabs/tab_strip_model.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/observer_list.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_member.h"
diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc
index 4259fd2..1a1d416 100644
--- a/chrome/browser/tabs/tab_strip_model_order_controller.cc
+++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
 
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 071975f..21ea248 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -6,14 +6,14 @@
 #include "base/path_service.h"
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_model_order_controller.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/stl_util-inl.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index 423a55f..31c28ca 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/task_manager_resource_providers.h"
-#include "chrome/browser/tab_util.h"
+#include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 3c872fb..90111fc 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -16,7 +16,7 @@
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/group_table_view.h"
 #include "chrome/browser/cache_manager_host.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "net/url_request/url_request_job_tracker.h"
 
 class MessageLoop;
diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc
index 7167957..be0ed1f 100644
--- a/chrome/browser/task_manager_resource_providers.cc
+++ b/chrome/browser/task_manager_resource_providers.cc
@@ -16,8 +16,8 @@
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/resource_message_filter.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/stl_util-inl.h"
 #include "chrome/common/gfx/icon_util.h"
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index e2cf9a5..ba40deb 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -5,10 +5,10 @@
 #include "chrome/browser/toolbar_model.h"
 
 #include "chrome/browser/cert_store.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/ssl_error_info.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc
index ef66737..0ec1dd0 100644
--- a/chrome/browser/views/blocked_popup_container.cc
+++ b/chrome/browser/views/blocked_popup_container.cc
@@ -14,7 +14,7 @@
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h
index 6da3e4f..3b012a8 100644
--- a/chrome/browser/views/blocked_popup_container.h
+++ b/chrome/browser/views/blocked_popup_container.h
@@ -14,8 +14,8 @@
 #include <vector>
 
 #include "base/gfx/rect.h"
-#include "chrome/browser/constrained_window.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/common/animation.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/views/base_button.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index e1327ac..0c32f22 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -17,9 +17,9 @@
 #include "chrome/browser/drag_utils.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/history.h"
-#include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index 1e6a0b8..5a9b5dd 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -6,8 +6,8 @@
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index 58d70aa..cf0a74e 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -9,11 +9,11 @@
 
 #include "base/string_util.h"
 #include "chrome/app/locales/locale_settings.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/url_fetcher.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index ec0b9d2..7f5eafe 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -7,13 +7,13 @@
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/tab_contents.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/web_app.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_contents_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/browser/views/constrained_window_impl.h b/chrome/browser/views/constrained_window_impl.h
index 836b2a9..229555e 100644
--- a/chrome/browser/views/constrained_window_impl.h
+++ b/chrome/browser/views/constrained_window_impl.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_CONSTRAINED_WINDOW_IMPL_H_
 
 #include "base/gfx/rect.h"
-#include "chrome/browser/constrained_window.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/constrained_window.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/views/custom_frame_window.h"
 
 class ConstrainedTabContentsWindowDelegate;
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc
index f21ef01..5467be7 100644
--- a/chrome/browser/views/download_shelf_view.cc
+++ b/chrome/browser/views/download_shelf_view.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
-#include "chrome/browser/navigation_entry.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/download_item_view.h"
 #include "chrome/browser/views/download_tab_view.h"
 #include "chrome/common/gfx/chrome_canvas.h"
diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc
index 001208d..b08b1c3 100644
--- a/chrome/browser/views/download_started_animation.cc
+++ b/chrome/browser/views/download_started_animation.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/download_started_animation.h"
 
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/widget_win.h"
 
diff --git a/chrome/browser/views/download_tab_view.h b/chrome/browser/views/download_tab_view.h
index 932f5c1..db6861f 100644
--- a/chrome/browser/views/download_tab_view.h
+++ b/chrome/browser/views/download_tab_view.h
@@ -10,7 +10,7 @@
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/browser/native_ui_contents.h"
+#include "chrome/browser/tab_contents/native_ui_contents.h"
 #include "chrome/views/event.h"
 #include "chrome/views/label.h"
 #include "chrome/views/link.h"
diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc
index f4aafcb..594dfbb 100644
--- a/chrome/browser/views/external_protocol_dialog.cc
+++ b/chrome/browser/views/external_protocol_dialog.cc
@@ -9,8 +9,8 @@
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/tab_util.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/message_box_view.h"
 #include "chrome/views/window.h"
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index 0510762..867f341 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/find_bar_view.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_contents_view.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/views/external_focus_tracker.h"
 #include "chrome/views/native_scroll_bar.h"
 #include "chrome/views/root_view.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 18823fd..ce04f73 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/encoding_menu_controller_delegate.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/about_chrome_view.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
@@ -32,8 +31,9 @@
 #include "chrome/browser/views/tab_contents_container_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/browser/views/toolbar_view.h"
-#include "chrome/browser/web_contents.h"
-#include "chrome/browser/web_contents_view.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc
index 5324b4b..b0584d4 100644
--- a/chrome/browser/views/frame/opaque_non_client_view.cc
+++ b/chrome/browser/views/frame/opaque_non_client_view.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/frame/opaque_non_client_view.h"
 
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
index 3b8b28c..224f882 100644
--- a/chrome/browser/views/html_dialog_view.h
+++ b/chrome/browser/views/html_dialog_view.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/dom_ui/html_dialog_contents.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/views/dom_view.h"
 
 class Browser;
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 4365b3e..9c55a1b 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/views/standard_layout.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
diff --git a/chrome/browser/views/hwnd_html_view.cc b/chrome/browser/views/hwnd_html_view.cc
index 41fc7c6..c418c1e 100644
--- a/chrome/browser/views/hwnd_html_view.cc
+++ b/chrome/browser/views/hwnd_html_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_widget_host_view_win.h"
 #include "chrome/browser/render_view_host_delegate.h"
-#include "chrome/browser/site_instance.h"
+#include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/views/widget.h"
 
 HWNDHtmlView::~HWNDHtmlView() {
diff --git a/chrome/browser/views/infobars/infobar_container.cc b/chrome/browser/views/infobars/infobar_container.cc
index 3a79464..d3d007f 100644
--- a/chrome/browser/views/infobars/infobar_container.cc
+++ b/chrome/browser/views/infobars/infobar_container.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/infobars/infobar_container.h"
 
-#include "chrome/browser/infobar_delegate.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/infobars/infobars.h"
 #include "chrome/common/notification_types.h"
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
index e0ae487..56f140b 100644
--- a/chrome/browser/views/infobars/infobars.h
+++ b/chrome/browser/views/infobars/infobars.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
 #define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
 
-#include "chrome/browser/infobar_delegate.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/views/base_button.h"
 #include "chrome/views/link.h"
 #include "chrome/views/native_button.h"
@@ -20,8 +20,8 @@ class Label;
 }
 
 // This file contains implementations for some general purpose InfoBars. See
-// chrome/browser/infobar_delegate.h for the delegate interface(s) that you must
-// implement to use these.
+// chrome/browser/tab_contents/infobar_delegate.h for the delegate interface(s)
+// that you must implement to use these.
 
 class InfoBar : public views::View,
                 public views::BaseButton::ButtonListener,
diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc
index 9bc23db..cad8583 100644
--- a/chrome/browser/views/location_bar_view.cc
+++ b/chrome/browser/views/location_bar_view.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/template_url.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h
index 054c79b..ad99fb5 100644
--- a/chrome/browser/views/location_bar_view.h
+++ b/chrome/browser/views/location_bar_view.h
@@ -10,7 +10,7 @@
 #include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/controller.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h
index 6df7c09..1d3bbac 100644
--- a/chrome/browser/views/page_info_window.h
+++ b/chrome/browser/views/page_info_window.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__
 #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__
 
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/native_button.h"
 #include "chrome/views/window.h"
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index fed7d5c..377eca2 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -9,7 +9,7 @@
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/url_fixer_upper.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/text_elider.h"
diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc
index 27e664e..01f449b 100644
--- a/chrome/browser/views/tab_contents_container_view.cc
+++ b/chrome/browser/views/tab_contents_container_view.cc
@@ -10,9 +10,9 @@
 #include "chrome/browser/render_view_host.h"
 #include "chrome/browser/render_view_host_manager.h"
 #include "chrome/browser/render_widget_host_view.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/view_ids.h"
-#include "chrome/browser/web_contents.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/widget.h"
 
diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc
index 46595f6..b9af037 100644
--- a/chrome/browser/views/tab_icon_view.cc
+++ b/chrome/browser/views/tab_icon_view.cc
@@ -14,7 +14,7 @@
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/app/chrome_dll_resource.h"
 
 static bool g_initialized = false;
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index f0b6d4a..57efb2d 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -8,14 +8,14 @@
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 
 #include "chrome/browser/browser_window.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/browser/views/tabs/tab.h"
 #include "chrome/browser/views/tabs/tab_strip.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/animation.h"
 #include "chrome/views/event.h"
 #include "chrome/views/root_view.h"
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index a509aff..5c9730a 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -9,7 +9,7 @@
 #include "base/message_loop.h"
 #include "base/timer.h"
 #include "chrome/browser/dock_info.h"
-#include "chrome/browser/tab_contents_delegate.h"
+#include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/tab_renderer.h"
 #include "chrome/common/notification_service.h"
diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc
index 9aaeee1..3b5e218 100644
--- a/chrome/browser/views/tabs/dragged_tab_view.cc
+++ b/chrome/browser/views/tabs/dragged_tab_view.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/tabs/dragged_tab_view.h"
 
 #include "chrome/common/gfx/chrome_canvas.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/browser/views/tabs/tab_renderer.h"
diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc
index 19e130c..3cf5908 100644
--- a/chrome/browser/views/tabs/hwnd_photobooth.cc
+++ b/chrome/browser/views/tabs/hwnd_photobooth.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/gfx/point.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tabs/hwnd_photobooth.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/widget_win.h"
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index 4581f6d..d0c51e7 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -8,8 +8,8 @@
 
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
-#include "chrome/browser/tab_contents.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index c460100..3232ec4 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -7,13 +7,13 @@
 #include "base/gfx/size.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/tabs/dragged_tab_controller.h"
 #include "chrome/browser/views/tabs/tab.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/drag_drop_types.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/path.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index ffd423d..aa3b4e9 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -16,9 +16,9 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/drag_utils.h"
-#include "chrome/browser/navigation_controller.h"
-#include "chrome/browser/navigation_entry.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/user_metrics.h"
 #include "chrome/browser/views/dom_view.h"
diff --git a/chrome/browser/web_app.cc b/chrome/browser/web_app.cc
index 506a94f1..0d24874e 100644
--- a/chrome/browser/web_app.cc
+++ b/chrome/browser/web_app.cc
@@ -7,7 +7,7 @@
 #include "base/gfx/png_decoder.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/render_view_host.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "net/base/base64.h"
 #include "net/base/data_url.h"
diff --git a/chrome/browser/web_app_icon_manager.cc b/chrome/browser/web_app_icon_manager.cc
index e544998..3d12aed 100644
--- a/chrome/browser/web_app_icon_manager.cc
+++ b/chrome/browser/web_app_icon_manager.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/web_contents.h"
+#include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/icon_util.h"
 #include "skia/include/SkBitmap.h"
 
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index eec9119..64e04de 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -11,7 +11,7 @@
 
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/security_style.h"
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 
 class ConstrainedWindowProxy;
diff --git a/chrome/test/test_tab_contents.cc b/chrome/test/test_tab_contents.cc
index 0cb8f54..768b9e7 100644
--- a/chrome/test/test_tab_contents.cc
+++ b/chrome/test/test_tab_contents.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/test/test_tab_contents.h"
 
-#include "chrome/browser/navigation_entry.h"
+#include "chrome/browser/tab_contents/navigation_entry.h"
 
 // static
 SiteInstance* TestTabContents::site_instance_ = NULL;
diff --git a/chrome/test/test_tab_contents.h b/chrome/test/test_tab_contents.h
index e8b56d4..d2aa48f 100644
--- a/chrome/test/test_tab_contents.h
+++ b/chrome/test/test_tab_contents.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_TEST_TEST_TAB_CONTENTS_H_
 
 #include "base/string_util.h"
-#include "chrome/browser/tab_contents.h"
-#include "chrome/browser/tab_contents_factory.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents/tab_contents_factory.h"
 
 // TabContents typed created by TestTabContentsFactory.
 class TestTabContents : public TabContents {
diff --git a/chrome/test/ui/ui_tests.vcproj b/chrome/test/ui/ui_tests.vcproj
index 9d5bdb1..83e351c 100644
--- a/chrome/test/ui/ui_tests.vcproj
+++ b/chrome/test/ui/ui_tests.vcproj
@@ -346,7 +346,7 @@
 			Name="TestViewSource"
 			>
 			<File
-				RelativePath="..\..\browser\view_source_uitest.cc"
+				RelativePath="..\..\browser\tab_contents\view_source_uitest.cc"
 				>
 			</File>
 		</Filter>
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 4a0194f..c9aa55c 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -154,11 +154,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\browser_with_test_window_test.h"
+				RelativePath="..\browser_with_test_window_test.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\browser_with_test_window_test.cc"
+				RelativePath="..\browser_with_test_window_test.h"
 				>
 			</File>
 			<File
@@ -779,7 +779,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\browser\web_contents_unittest.cc"
+			RelativePath="..\..\browser\tab_contents\web_contents_unittest.cc"
 			>
 		</File>
 		<File
@@ -798,10 +798,10 @@
 			RelativePath="..\..\browser\window_sizer_unittest.cc"
 			>
 		</File>
-    <File
-      RelativePath="..\..\common\worker_thread_ticker_unittest.cc"
-      >
-    </File>
+		<File
+			RelativePath="..\..\common\worker_thread_ticker_unittest.cc"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
author	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2009-01-15 00:59:16 +0000
committer	ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>	2009-01-15 00:59:16 +0000
commit	f3ec774a2c177d3c6845553d3bf9735a7b8a5907 (patch)
tree	ed09ccf69300383bd4b2e8ac7c8b9d1bdeead07b
parent	bb515eda39129537a089a062c3db3152e63f24d9 (diff)
download	chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.zip chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.gz chromium_src-f3ec774a2c177d3c6845553d3bf9735a7b8a5907.tar.bz2