Move files out of browser and into either renderer_host or tab_contents.

This also fixes a crash in the web contents unit test in a commented-out test and re-enable it.
Review URL: http://codereview.chromium.org/18504

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

68 files changed, 218 insertions, 598 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 5ec7ffd..f4bccc7 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/printing/print_job.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/ssl/ssl_blocking_page.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index 84917e2..805f12d0 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -126,16 +126,6 @@ input_files = ChromeFileList([
     'profile.h',
     'profile_manager.cc',
     'profile_manager.h',
-    'render_view_host.cc',
-    'render_view_host.h',
-    'render_view_host_delegate.h',
-    'render_widget_helper.cc',
-    'render_widget_helper.h',
-    'render_widget_host.cc',
-    'render_widget_host.h',
-    'render_widget_host_view.h',
-    'render_widget_host_view_win.cc',
-    'render_widget_host_view_win.h',
     'resource_message_filter.cc',
     'resource_message_filter.h',
     'resource_request_details.h',
@@ -181,12 +171,6 @@ input_files = ChromeFileList([
     'bookmarks/bookmark_utils.h',
   ]),
   MSVSFilter('Tab Contents (Old)', [
-    'render_view_context_menu.cc',
-    'render_view_context_menu.h',
-    'render_view_context_menu_controller.cc',
-    'render_view_context_menu_controller.h',
-    'render_view_host_manager.cc',
-    'render_view_host_manager.h',
     'security_style.h',
   ]),
   MSVSFilter('Browser Window', [
@@ -224,10 +208,6 @@ input_files = ChromeFileList([
     'window_sizer.cc',
     'window_sizer.h',
   ]),
-  MSVSFilter('Policy', [
-    'renderer_security_policy.cc',
-    'renderer_security_policy.h',
-  ]),
   MSVSFilter('Destination', [
     'base_history_model.cc',
     'base_history_model.h',
@@ -550,6 +530,18 @@ input_files = ChromeFileList([
     'renderer_host/download_throttling_resource_handler.h',
     'renderer_host/browser_render_process_host.cc',
     'renderer_host/browser_render_process_host.h',
+    'renderer_host/render_view_host.cc',
+    'renderer_host/render_view_host.h',
+    'renderer_host/render_view_host_delegate.h',
+    'renderer_host/render_widget_helper.cc',
+    'renderer_host/render_widget_helper.h',
+    'renderer_host/render_widget_host.cc',
+    'renderer_host/render_widget_host.h',
+    'renderer_host/render_widget_host_view.h',
+    'renderer_host/render_widget_host_view_win.cc',
+    'renderer_host/render_widget_host_view_win.h',
+    'renderer_host/renderer_security_policy.cc',
+    'renderer_host/renderer_security_policy.h',
     'renderer_host/resource_dispatcher_host.cc',
     'renderer_host/resource_dispatcher_host.h',
     'renderer_host/resource_handler.h',
@@ -579,6 +571,12 @@ input_files = ChromeFileList([
     'tab_contents/page_navigator.h',
     'tab_contents/provisional_load_details.cc',
     'tab_contents/provisional_load_details.h',
+    'tab_contents/render_view_context_menu.cc',
+    'tab_contents/render_view_context_menu.h',
+    'tab_contents/render_view_context_menu_controller.cc',
+    'tab_contents/render_view_context_menu_controller.h',
+    'tab_contents/render_view_host_manager.cc',
+    'tab_contents/render_view_host_manager.h',
     'tab_contents/site_instance.cc',
     'tab_contents/site_instance.h',
     'tab_contents/status_view.cc',
@@ -778,8 +776,6 @@ if not env.Bit('windows'):
       'printing/win_printing_context.cc',
       'profile.cc',
       'profile_manager.cc',
-      'render_view_context_menu.cc',
-      'render_view_context_menu_controller.cc',
       'render_view_host.cc',
       'render_view_host_manager.cc',
       'render_widget_helper.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 19cc20a..7deb350 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -482,46 +482,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\render_view_host.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_host.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_host_delegate.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_helper.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_helper.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_host.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_host.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_host_view.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_host_view_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_widget_host_view_win.h"
-				>
-			</File>
-			<File
 				RelativePath=".\resource_message_filter.cc"
 				>
 			</File>
@@ -694,30 +654,6 @@
 			Name="Tab Contents (Old)"
 			>
 			<File
-				RelativePath=".\render_view_context_menu.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_context_menu.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_context_menu_controller.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_context_menu_controller.h"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_host_manager.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\render_view_host_manager.h"
-				>
-			</File>
-			<File
 				RelativePath=".\security_style.h"
 				>
 			</File>
@@ -859,18 +795,6 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Policy"
-			>
-			<File
-				RelativePath=".\renderer_security_policy.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\renderer_security_policy.h"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="Destination"
 			>
 			<File
@@ -1548,24 +1472,6 @@
 			<File
 				RelativePath=".\password_manager\encryptor.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=".\password_manager\encryptor.h"
@@ -1746,24 +1652,6 @@
 			<File
 				RelativePath=".\net\url_fetcher.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=".\net\url_fetcher.h"
@@ -1772,24 +1660,6 @@
 			<File
 				RelativePath=".\net\url_fetcher_protect.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=".\net\url_fetcher_protect.h"
@@ -1798,24 +1668,6 @@
 			<File
 				RelativePath=".\net\url_fixer_upper.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=".\net\url_fixer_upper.h"
@@ -2146,6 +1998,54 @@
 				>
 			</File>
 			<File
+				RelativePath=".\renderer_host\render_view_host.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_view_host.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_view_host_delegate.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_helper.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_helper.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_host.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_host.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_host_view.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_host_view_win.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\render_widget_host_view_win.h"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\renderer_security_policy.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\renderer_host\renderer_security_policy.h"
+				>
+			</File>
+			<File
 				RelativePath=".\renderer_host\resource_dispatcher_host.cc"
 				>
 			</File>
@@ -2200,24 +2100,6 @@
 			<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"
@@ -2234,24 +2116,6 @@
 			<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"
@@ -2260,24 +2124,6 @@
 			<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"
@@ -2286,24 +2132,6 @@
 			<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"
@@ -2324,50 +2152,38 @@
 			<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\render_view_context_menu.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\render_view_context_menu.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\render_view_context_menu_controller.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\render_view_context_menu_controller.h"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\render_view_host_manager.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\tab_contents\render_view_host_manager.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"
@@ -2448,24 +2264,6 @@
 			<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"
@@ -2474,24 +2272,6 @@
 			<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"
@@ -2504,24 +2284,6 @@
 			<File
 				RelativePath=".\search_engines\template_url.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=".\search_engines\template_url.h"
@@ -2530,24 +2292,6 @@
 			<File
 				RelativePath=".\search_engines\template_url_fetcher.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=".\search_engines\template_url_fetcher.h"
@@ -2556,24 +2300,6 @@
 			<File
 				RelativePath=".\search_engines\template_url_model.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=".\search_engines\template_url_model.h"
@@ -2582,24 +2308,6 @@
 			<File
 				RelativePath=".\search_engines\template_url_parser.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=".\search_engines\template_url_parser.h"
@@ -2608,24 +2316,6 @@
 			<File
 				RelativePath=".\search_engines\template_url_prepopulate_data.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=".\search_engines\template_url_prepopulate_data.h"
@@ -2674,24 +2364,6 @@
 			<File
 				RelativePath=".\ssl\ssl_blocking_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=".\ssl\ssl_blocking_page.h"
@@ -2700,24 +2372,6 @@
 			<File
 				RelativePath=".\ssl\ssl_error_info.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=".\ssl\ssl_error_info.h"
@@ -2726,24 +2380,6 @@
 			<File
 				RelativePath=".\ssl\ssl_manager.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=".\ssl\ssl_manager.h"
@@ -2752,24 +2388,6 @@
 			<File
 				RelativePath=".\ssl\ssl_policy.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=".\ssl\ssl_policy.h"
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index e8294d8..d5eadc4 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -27,8 +27,8 @@
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
-#include "chrome/browser/render_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/browser/renderer_host/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"
diff --git a/chrome/browser/browser_accessibility_manager.cc b/chrome/browser/browser_accessibility_manager.cc
index 0d46274..4eef338 100644
--- a/chrome/browser/browser_accessibility_manager.cc
+++ b/chrome/browser/browser_accessibility_manager.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/browser_accessibility.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 
 // The time in ms after which we give up and return an error when processing an
 // accessibility message and no response has been received from the renderer.
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc
index 2815e78..8d0df32 100644
--- a/chrome/browser/browser_shutdown.cc
+++ b/chrome/browser/browser_shutdown.cc
@@ -17,8 +17,8 @@
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/cert_store.cc b/chrome/browser/cert_store.cc
index 4dc32ee..a2fdd7a 100644
--- a/chrome/browser/cert_store.cc
+++ b/chrome/browser/cert_store.cc
@@ -8,7 +8,7 @@
 #include <functional>
 
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/stl_util-inl.h"
 
diff --git a/chrome/browser/debugger/debugger_host_impl.cpp b/chrome/browser/debugger/debugger_host_impl.cpp
index 0d39964..2f46feb 100644
--- a/chrome/browser/debugger/debugger_host_impl.cpp
+++ b/chrome/browser/debugger/debugger_host_impl.cpp
@@ -8,7 +8,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/debugger/debugger_io.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/notification_service.h"
 
diff --git a/chrome/browser/debugger/debugger_node.cc b/chrome/browser/debugger/debugger_node.cc
index 86587c5..8a28b49 100644
--- a/chrome/browser/debugger/debugger_node.cc
+++ b/chrome/browser/debugger/debugger_node.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/debugger/debugger_shell.h"
 
diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc
index 97cb229..662deef 100644
--- a/chrome/browser/debugger/debugger_view.cc
+++ b/chrome/browser/debugger/debugger_view.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/debugger/debugger_view.h"
 #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/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/standard_layout.h"
diff --git a/chrome/browser/dom_ui/dom_ui_contents.cc b/chrome/browser/dom_ui/dom_ui_contents.cc
index 1f6f220..a32a4cd 100644
--- a/chrome/browser/dom_ui/dom_ui_contents.cc
+++ b/chrome/browser/dom_ui/dom_ui_contents.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/history_ui.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/resource_bundle.h"
 
diff --git a/chrome/browser/dom_ui/dom_ui_host.cc b/chrome/browser/dom_ui/dom_ui_host.cc
index 91ba5f5..bcc22844 100644
--- a/chrome/browser/dom_ui/dom_ui_host.cc
+++ b/chrome/browser/dom_ui/dom_ui_host.cc
@@ -7,9 +7,9 @@
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/renderer_host/render_view_host.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,
                      SiteInstance* instance,
diff --git a/chrome/browser/dom_ui/html_dialog_contents.cc b/chrome/browser/dom_ui/html_dialog_contents.cc
index 0b4a7a9..0a419fb 100644
--- a/chrome/browser/dom_ui/html_dialog_contents.cc
+++ b/chrome/browser/dom_ui/html_dialog_contents.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/dom_ui/html_dialog_contents.h"
 
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 const char kGearsScheme[] = "gears";
 
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 8d11080..dfe2c1f 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/search_engines/template_url.h"
diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc
index 96fe0dd..fde5103 100644
--- a/chrome/browser/download/download_manager.cc
+++ b/chrome/browser/download/download_manager.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 43096e0..ac3844e 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -19,8 +19,8 @@
 #include "chrome/browser/download/save_page_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
diff --git a/chrome/browser/download/save_package.h b/chrome/browser/download/save_package.h
index 3363df5..a047b3f 100644
--- a/chrome/browser/download/save_package.h
+++ b/chrome/browser/download/save_package.h
@@ -17,7 +17,7 @@
 #include "chrome/common/pref_member.h"
 #include "chrome/browser/download/save_item.h"
 #include "chrome/browser/download/save_types.h"
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 
 class SaveFileManager;
 class SavePackage;
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index 2f5bd97..6722336fb 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -6,7 +6,7 @@
 
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.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"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 0a79f80..321d8cf 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 
diff --git a/chrome/browser/modal_html_dialog_delegate.cc b/chrome/browser/modal_html_dialog_delegate.cc
index 46489cc..4afdd47 100644
--- a/chrome/browser/modal_html_dialog_delegate.cc
+++ b/chrome/browser/modal_html_dialog_delegate.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/modal_html_dialog_delegate.h"
 
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 ModalHtmlDialogDelegate::ModalHtmlDialogDelegate(
     const GURL& url, int width, int height, const std::string& json_arguments,
diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index 9ae2efb..6813a15 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -9,7 +9,7 @@
 #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/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/emf.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 7380510..a93cbbe 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -29,8 +29,8 @@
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/plugin_service.h"
-#include "chrome/browser/render_widget_helper.h"
-#include "chrome/browser/renderer_security_policy.h"
+#include "chrome/browser/renderer_host/render_widget_helper.h"
+#include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/resource_message_filter.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/visitedlink_master.h"
@@ -48,7 +48,7 @@
 
 #if defined(OS_WIN)
 // TODO(port): see comment by the only usage of RenderViewHost in this file.
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 // Once the above TODO is finished, then this block is all Windows-specific
 // files.
diff --git a/chrome/browser/renderer_host/cross_site_resource_handler.cc b/chrome/browser/renderer_host/cross_site_resource_handler.cc
index 91695df..a172352 100644
--- a/chrome/browser/renderer_host/cross_site_resource_handler.cc
+++ b/chrome/browser/renderer_host/cross_site_resource_handler.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 
diff --git a/chrome/browser/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 152c3d6..dca1a1d 100644
--- a/chrome/browser/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 #include <string>
 #include <vector>
@@ -14,12 +14,12 @@
 #include "chrome/browser/cross_site_request_manager.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/metrics/user_metrics.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/renderer_host/render_process_host.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/renderer_security_policy.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"
diff --git a/chrome/browser/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 7b0ef7a..4ae497f 100644
--- a/chrome/browser/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/render_view_host_delegate.h"
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/page_zoom.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
diff --git a/chrome/browser/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h
index 34aba46..764e8ca 100644
--- a/chrome/browser/render_view_host_delegate.h
+++ b/chrome/browser/renderer_host/render_view_host_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_VIEW_HOST_DELEGATE_H__
-#define CHROME_BROWSER_RENDER_VIEW_HOST_DELEGATE_H__
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -392,5 +392,5 @@ class RenderViewHostDelegate {
   virtual bool CanTerminate() const { return true; }
 };
 
-#endif  // CHROME_BROWSER_RENDER_VIEW_HOST_DELEGATE_H__
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_
 
diff --git a/chrome/browser/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index 7542d27..8d85d92 100644
--- a/chrome/browser/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.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/render_widget_helper.h"
+#include "chrome/browser/renderer_host/render_widget_helper.h"
 
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/render_widget_helper.h b/chrome/browser/renderer_host/render_widget_helper.h
index 9ec75e0..aca3644 100644
--- a/chrome/browser/render_widget_helper.h
+++ b/chrome/browser/renderer_host/render_widget_helper.h
@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
-#define CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
+#ifndef CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
+#define CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
 
 #include "base/atomic_sequence_num.h"
 #include "base/hash_tables.h"
@@ -153,7 +153,7 @@ class RenderWidgetHelper :
   // Whether popup blocking is enabled or not.
   bool block_popups_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RenderWidgetHelper);
+  DISALLOW_COPY_AND_ASSIGN(RenderWidgetHelper);
 };
 
-#endif  // CHROME_BROWSER_RENDER_WIDGET_HELPER_H__
+#endif  // CHROME_BROWSER_RENDEDER_HOST_RENDER_WIDGET_HELPER_H_
diff --git a/chrome/browser/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index fdbec92..7a77a02 100644
--- a/chrome/browser/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 
 #include "base/gfx/gdi_util.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/render_widget_helper.h"
-#include "chrome/browser/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/browser/renderer_host/render_widget_helper.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/mru_cache.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
diff --git a/chrome/browser/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index dbaccd5c..d683e84 100644
--- a/chrome/browser/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_H_
-#define CHROME_BROWSER_RENDER_WIDGET_HOST_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
 
 #include <windows.h>
 
@@ -355,7 +355,7 @@ class RenderWidgetHost::BackingStore {
   // Handle to the original bitmap in the dc.
   HANDLE original_bitmap_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BackingStore);
+  DISALLOW_COPY_AND_ASSIGN(BackingStore);
 };
 
 class RenderWidgetHost::PaintObserver {
@@ -366,4 +366,4 @@ class RenderWidgetHost::PaintObserver {
   virtual void RenderWidgetHostDidPaint(RenderWidgetHost* rwh) = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_H_
+#endif  // #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_H_
diff --git a/chrome/browser/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index 0797cc5..8e6152f 100644
--- a/chrome/browser/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_H_
-#define CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
 
 #include <windows.h>
 
@@ -117,5 +117,5 @@ class RenderWidgetHostView {
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostView);
 };
 
-#endif  // #ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_H_
 
diff --git a/chrome/browser/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 251a8c7..f628809 100644
--- a/chrome/browser/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_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/render_widget_host_view_win.h"
+#include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
@@ -15,8 +15,8 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 // TODO(beng): (Cleanup) we should not need to include this file... see comment
 //             in |DidBecomeSelected|.
-#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 91b3684..a735ab0 100644
--- a/chrome/browser/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_WIN_H_
-#define CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_WIN_H_
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -16,7 +16,7 @@
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "chrome/browser/ime_input.h"
-#include "chrome/browser/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/views/focus_manager.h"
 
@@ -279,5 +279,5 @@ class RenderWidgetHostViewWin :
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewWin);
 };
 
-#endif  // #ifndef CHROME_BROWSER_RENDER_WIDGET_HOST_VIEW_WIN_H_
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_WIN_H_
 
diff --git a/chrome/browser/renderer_security_policy.cc b/chrome/browser/renderer_host/renderer_security_policy.cc
index 32d29f8..ccea740 100644
--- a/chrome/browser/renderer_security_policy.cc
+++ b/chrome/browser/renderer_host/renderer_security_policy.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/renderer_security_policy.h"
+#include "chrome/browser/renderer_host/renderer_security_policy.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/chrome/browser/renderer_security_policy.h b/chrome/browser/renderer_host/renderer_security_policy.h
index 86d1e73..646f783 100644
--- a/chrome/browser/renderer_security_policy.h
+++ b/chrome/browser/renderer_host/renderer_security_policy.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
-#define CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDERER_SECURITY_POLICY_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDERER_SECURITY_POLICY_H_
 
 #include <string>
 #include <map>
@@ -115,8 +115,8 @@ class RendererSecurityPolicy {
   // not escape this class.
   SecurityStateMap security_state_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RendererSecurityPolicy);
+  DISALLOW_COPY_AND_ASSIGN(RendererSecurityPolicy);
 };
 
-#endif  // CHROME_BROWSER_RENDERER_SECURITY_POLICY_H__
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDERER_SECURITY_POLICY_H_
 
diff --git a/chrome/browser/renderer_security_policy_unittest.cc b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc
index 7d4318d..ae3ac52 100644
--- a/chrome/browser/renderer_security_policy_unittest.cc
+++ b/chrome/browser/renderer_host/renderer_security_policy_unittest.cc
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/renderer_security_policy.h"
+#include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_job.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index 7c74420..261d1c1 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -20,16 +20,16 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/login_prompt.h"
 #include "chrome/browser/plugin_service.h"
-#include "chrome/browser/render_view_host.h"
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/renderer_host/async_resource_handler.h"
 #include "chrome/browser/renderer_host/buffered_resource_handler.h"
 #include "chrome/browser/renderer_host/cross_site_resource_handler.h"
 #include "chrome/browser/renderer_host/download_resource_handler.h"
+#include "chrome/browser/renderer_host/renderer_security_policy.h"
 #include "chrome/browser/renderer_host/safe_browsing_resource_handler.h"
 #include "chrome/browser/renderer_host/save_file_resource_handler.h"
 #include "chrome/browser/renderer_host/sync_resource_handler.h"
-#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_contents/tab_util.h"
diff --git a/chrome/browser/renderer_host/test_render_view_host.cc b/chrome/browser/renderer_host/test_render_view_host.cc
index 7c47b53..1c77bb8 100644
--- a/chrome/browser/renderer_host/test_render_view_host.cc
+++ b/chrome/browser/renderer_host/test_render_view_host.cc
@@ -73,8 +73,10 @@ void RenderViewHostTestHarness::SetUp() {
 }
 
 void RenderViewHostTestHarness::TearDown() {
-  contents_->CloseContents();
-  contents_ = NULL;
+  if (contents_) {
+    contents_->CloseContents();
+    contents_ = NULL;
+  }
   controller_ = NULL;
 
   // Make sure that we flush any messages related to WebContents destruction
diff --git a/chrome/browser/renderer_host/test_render_view_host.h b/chrome/browser/renderer_host/test_render_view_host.h
index ba7c7ea..be7acfe 100644
--- a/chrome/browser/renderer_host/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test_render_view_host.h
@@ -9,9 +9,9 @@
 #include "base/message_loop.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/test_web_contents.h"
-#include "chrome/browser/render_view_host.h"
 #include "chrome/browser/renderer_host/mock_render_process_host.h"
-#include "chrome/browser/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -183,6 +183,12 @@ class RenderViewHostTestHarness : public testing::Test {
     return profile_.get();
   }
 
+  // Marks the contents as already cleaned up. If a test calls CloseContents,
+  // then our cleanup code shouldn't run. This function makes sure that happens.
+  void ContentsCleanedUp() {
+    contents_ = NULL;
+  }
+
  protected:
   // testing::Test
   virtual void SetUp();
diff --git a/chrome/browser/resource_message_filter.cc b/chrome/browser/resource_message_filter.cc
index 5732ed9..c959ae7 100644
--- a/chrome/browser/resource_message_filter.cc
+++ b/chrome/browser/resource_message_filter.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/profile.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/browser/render_widget_helper.h"
+#include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/spellchecker.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
diff --git a/chrome/browser/site_instance_unittest.cc b/chrome/browser/site_instance_unittest.cc
index 647a221..d1691fa 100644
--- a/chrome/browser/site_instance_unittest.cc
+++ b/chrome/browser/site_instance_unittest.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/render_view_host.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/render_messages.h"
diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index b2fd246..49227e2 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/resource_request_details.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ssl/ssl_policy.h"
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index e857244..61aada3 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -9,7 +9,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/cert_store.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc
index 491b1cc..bc65504 100644
--- a/chrome/browser/tab_contents/interstitial_page.cc
+++ b/chrome/browser/tab_contents/interstitial_page.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_resources.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/render_widget_host_view_win.h"
+#include "chrome/browser/renderer_host/render_widget_host_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"
diff --git a/chrome/browser/tab_contents/interstitial_page.h b/chrome/browser/tab_contents/interstitial_page.h
index 9a68f95..755ec65 100644
--- a/chrome/browser/tab_contents/interstitial_page.h
+++ b/chrome/browser/tab_contents/interstitial_page.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 311ba27..4aecf00 100644
--- a/chrome/browser/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.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/render_view_context_menu.h"
+#include "chrome/browser/tab_contents/render_view_context_menu.h"
 
 #include "base/logging.h"
 #include "chrome/app/chrome_dll_resource.h"
diff --git a/chrome/browser/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h
index a38cbe8..6c95f57 100644
--- a/chrome/browser/render_view_context_menu.h
+++ b/chrome/browser/tab_contents/render_view_context_menu.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_H__
-#define CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_H__
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_H_
 
 #include "chrome/views/menu.h"
 #include "webkit/glue/context_node_types.h"
@@ -37,8 +37,8 @@ class RenderViewContextMenu : public Menu {
   Profile* profile_;
   Menu* spellchecker_sub_menu_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(RenderViewContextMenu);
+  DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
 };
 
-#endif  // CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_H__
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_H_
 
diff --git a/chrome/browser/render_view_context_menu_controller.cc b/chrome/browser/tab_contents/render_view_context_menu_controller.cc
index 307bae4..4b3a245 100644
--- a/chrome/browser/render_view_context_menu_controller.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu_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/render_view_context_menu_controller.h"
+#include "chrome/browser/tab_contents/render_view_context_menu_controller.h"
 
 #include "base/command_line.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/render_view_context_menu_controller.h b/chrome/browser/tab_contents/render_view_context_menu_controller.h
index b03fd3b..89270b5 100644
--- a/chrome/browser/render_view_context_menu_controller.h
+++ b/chrome/browser/tab_contents/render_view_context_menu_controller.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H__
-#define CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H__
+#ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H_
+#define CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H_
 
 #include "chrome/common/pref_member.h"
 #include "chrome/views/menu.h"
@@ -52,5 +52,5 @@ class RenderViewContextMenuController : public Menu::Delegate {
   int current_dictionary_language_index_;
 };
 
-#endif  // CHROME_BROWSER_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H__
+#endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_CONTEXT_MENU_CONTROLLER_H_
 
diff --git a/chrome/browser/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index 05d07f5..3e235e2 100644
--- a/chrome/browser/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/render_view_host_manager.h"
+#include "chrome/browser/tab_contents/render_view_host_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.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/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.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"
diff --git a/chrome/browser/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h
index ee0e16b..29a9f8f 100644
--- a/chrome/browser/render_view_host_manager.h
+++ b/chrome/browser/tab_contents/render_view_host_manager.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_RENDER_VIEW_HOST_MANAGER_H_
-#define CHROME_BROWSER_RENDER_VIEW_HOST_MANAGER_H_
+#ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
+#define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 class InterstitialPage;
 class NavigationController;
@@ -230,5 +230,5 @@ struct RenderViewHostSwitchedDetails {
   RenderViewHost* new_host;
 };
 
-#endif  // CHROME_BROWSER_RENDER_VIEW_HOST_MANAGER_H_
+#endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
diff --git a/chrome/browser/tab_contents/tab_util.cc b/chrome/browser/tab_contents/tab_util.cc
index 8cea595..9943279 100644
--- a/chrome/browser/tab_contents/tab_util.cc
+++ b/chrome/browser/tab_contents/tab_util.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/tab_contents/tab_util.h"
 
-#include "chrome/browser/render_view_host.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "net/url_request/url_request.h"
diff --git a/chrome/browser/tab_contents/view_source_contents.cc b/chrome/browser/tab_contents/view_source_contents.cc
index 849a005..291b0c3 100644
--- a/chrome/browser/tab_contents/view_source_contents.cc
+++ b/chrome/browser/tab_contents/view_source_contents.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/tab_contents/view_source_contents.h"
 
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/render_view_host.h"
 
 ViewSourceContents::ViewSourceContents(Profile* profile, SiteInstance* instance)
     : WebContents(profile, instance, NULL, MSG_ROUTING_NONE, NULL) {
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 9062894..cf36173 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -28,8 +28,8 @@
 #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/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view_win.h"  // TODO(brettw) delete me.
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/tab_contents/web_contents.h b/chrome/browser/tab_contents/web_contents.h
index 9600a15..c3094a4 100644
--- a/chrome/browser/tab_contents/web_contents.h
+++ b/chrome/browser/tab_contents/web_contents.h
@@ -9,8 +9,8 @@
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
 #include "chrome/browser/printing/print_view_manager.h"
-#include "chrome/browser/render_view_host_delegate.h"
-#include "chrome/browser/render_view_host_manager.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
+#include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/web_app.h"
diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
index 211d1e8..60f795e 100644
--- a/chrome/browser/tab_contents/web_contents_unittest.cc
+++ b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/test_render_view_host.h"
-#include "chrome/browser/render_widget_host_view.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"
@@ -887,8 +887,6 @@ TEST_F(WebContentsTest, ShowInterstitialThenNavigate) {
   EXPECT_EQ(TestInterstitialPage::CANCELED, state);
 }
 
-// TODO(brettw) fix this test.
-#if 0
 // Test navigating to a page that shows an interstitial, then close the tab.
 TEST_F(WebContentsTest, ShowInterstitialThenCloseTab) {
   // Show interstitial.
@@ -904,10 +902,10 @@ TEST_F(WebContentsTest, ShowInterstitialThenCloseTab) {
 
   // Now close the tab.
   contents()->CloseContents();
+  ContentsCleanedUp();
   EXPECT_TRUE(deleted);
   EXPECT_EQ(TestInterstitialPage::CANCELED, state);
 }
-#endif
 
 // Test that after Proceed is called and an interstitial is still shown, no more
 // commands get executed.
diff --git a/chrome/browser/tab_contents/web_contents_view.cc b/chrome/browser/tab_contents/web_contents_view.cc
index c3c8e8b..eee0d98 100644
--- a/chrome/browser/tab_contents/web_contents_view.cc
+++ b/chrome/browser/tab_contents/web_contents_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/tab_contents/web_contents_view.h"
 
-#include "chrome/browser/render_widget_host.h"
+#include "chrome/browser/renderer_host/render_widget_host.h"
 
 void WebContentsView::RenderWidgetHostDestroyed(RenderWidgetHost* host) {
   for (PendingWidgetViews::iterator i = pending_widget_views_.begin();
diff --git a/chrome/browser/tab_contents/web_contents_view.h b/chrome/browser/tab_contents/web_contents_view.h
index bec1064..12f4ab8 100644
--- a/chrome/browser/tab_contents/web_contents_view.h
+++ b/chrome/browser/tab_contents/web_contents_view.h
@@ -13,7 +13,7 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 
 class Browser;
 class RenderViewHost;
diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc
index 54eb162..5f1016a 100644
--- a/chrome/browser/tab_contents/web_contents_view_win.cc
+++ b/chrome/browser/tab_contents/web_contents_view_win.cc
@@ -10,10 +10,10 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_request_manager.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/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view_win.h"
+#include "chrome/browser/tab_contents/render_view_context_menu.h"
+#include "chrome/browser/tab_contents/render_view_context_menu_controller.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"
diff --git a/chrome/browser/tab_contents/web_drag_source.cc b/chrome/browser/tab_contents/web_drag_source.cc
index b47913b..c1061ee 100644
--- a/chrome/browser/tab_contents/web_drag_source.cc
+++ b/chrome/browser/tab_contents/web_drag_source.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/tab_contents/web_drag_source.h"
 
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 
 namespace {
 
diff --git a/chrome/browser/tab_contents/web_drop_target.cc b/chrome/browser/tab_contents/web_drop_target.cc
index c3220e5..90ac002 100644
--- a/chrome/browser/tab_contents/web_drop_target.cc
+++ b/chrome/browser/tab_contents/web_drop_target.cc
@@ -9,7 +9,7 @@
 
 #include "base/clipboard_util.h"
 #include "base/gfx/point.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/os_exchange_data.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 45a2246..2599382 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc
index 867f341..d58cf6c 100644
--- a/chrome/browser/views/find_bar_win.cc
+++ b/chrome/browser/views/find_bar_win.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_notification_details.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/find_bar_view.h"
diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h
index 6cc6029..f1727de 100644
--- a/chrome/browser/views/find_bar_win.h
+++ b/chrome/browser/views/find_bar_win.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_FIND_BAR_WIN_H_
 
 #include "base/gfx/rect.h"
-#include "chrome/browser/render_view_host_delegate.h"
+#include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/animation.h"
 #include "chrome/views/widget_win.h"
 
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 9c55a1b..bf35e50 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/app/result_codes.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/chrome_constants.h"
diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc
index 01f449b..cfcb301 100644
--- a/chrome/browser/views/tab_contents_container_view.cc
+++ b/chrome/browser/views/tab_contents_container_view.cc
@@ -7,9 +7,9 @@
 #include "chrome/browser/views/tab_contents_container_view.h"
 
 #include "base/logging.h"
-#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/renderer_host/render_view_host.h"
+#include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "chrome/browser/tab_contents/render_view_host_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/view_ids.h"
diff --git a/chrome/browser/web_app.cc b/chrome/browser/web_app.cc
index 0d24874e..10f7e35 100644
--- a/chrome/browser/web_app.cc
+++ b/chrome/browser/web_app.cc
@@ -6,7 +6,7 @@
 
 #include "base/gfx/png_decoder.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/render_view_host.h"
+#include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "net/base/base64.h"
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index bb223ad..ad1b852 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -575,7 +575,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\browser\renderer_security_policy_unittest.cc"
+				RelativePath="..\..\browser\renderer_host\renderer_security_policy_unittest.cc"
 				>
 			</File>
 			<File