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

1 files changed, 72 insertions, 454 deletions

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"