Prep for generated .vcproj files:

Fix minor stylistic inconsistencies in some .vcproj files:
* /> tag termination:
    net\net_resources.vcproj
* Add empty <ToolFiles>, <References> and <Globals> sections:
    net\net_resources.vcproj
    third_party\zlib\zlib.vcproj
    third_party\libpng\libpng.vcproj
    chrome\tools\test\image_diff\image_diff.vcproj
* Remove .\ on file names where its use is inconsistent with the rest
  of the file names in the .vcproj:
    net\build\net.vcproj
    net\build\net_unittests.vcproj
    chrome\installer\util\util.vcproj
* Add explicit RootNamespace attribute:
    chrome\test\automation\automation.vcproj
    testing\gtest.vcproj
* Fix file order in four locales that don't match other locale .vcproj files:
    chrome\app\locales\da.vcproj
    chrome\app\locales\he.vcproj
    chrome\app\locales\zh-TW.vcproj
    chrome\app\locales\en-US.vcproj
* Remove duplicate files from the list:
    chrome\browser\views\browser_views.vcproj (event_utils.[ch])
Review URL: http://codereview.chromium.org/18555

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

8 files changed, 49 insertions, 50 deletions

diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj
index 01cf830..dd54dc6 100644
--- a/chrome/app/locales/da.vcproj
+++ b/chrome/app/locales/da.vcproj
@@ -144,11 +144,11 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc"
+			RelativePath="..\resources\locale_settings_da.rc"
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_da.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc"
 			>
 		</File>
 	</Files>
diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj
index 0a65436..1970cdf 100644
--- a/chrome/app/locales/en-US.vcproj
+++ b/chrome/app/locales/en-US.vcproj
@@ -146,11 +146,11 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"
+			RelativePath="..\resources\locale_settings_en-US.rc"
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_en-US.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc"
 			>
 		</File>
 	</Files>
diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj
index 074542f..f2772f0 100644
--- a/chrome/app/locales/he.vcproj
+++ b/chrome/app/locales/he.vcproj
@@ -144,11 +144,11 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc"
+			RelativePath="..\resources\locale_settings_he.rc"
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_he.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc"
 			>
 		</File>
 	</Files>
diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj
index e07d271..941348d 100644
--- a/chrome/app/locales/zh-TW.vcproj
+++ b/chrome/app/locales/zh-TW.vcproj
@@ -144,11 +144,11 @@
 			>
 		</File>
 		<File
-			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc"
+			RelativePath="..\resources\locale_settings_zh-TW.rc"
 			>
 		</File>
 		<File
-			RelativePath="..\resources\locale_settings_zh-TW.rc"
+			RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc"
 			>
 		</File>
 	</Files>
diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj
index 994adf9..97a98c2 100644
--- a/chrome/browser/views/browser_views.vcproj
+++ b/chrome/browser/views/browser_views.vcproj
@@ -494,14 +494,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\event_utils.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\event_utils.h"
-			>
-		</File>
-		<File
 			RelativePath=".\event_utils.h"
 			>
 		</File>
diff --git a/chrome/installer/util/util.vcproj b/chrome/installer/util/util.vcproj
index 22700c7..6bd7ed0 100644
--- a/chrome/installer/util/util.vcproj
+++ b/chrome/installer/util/util.vcproj
@@ -121,59 +121,59 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="browser_distribution.cc"
+			RelativePath=".\browser_distribution.cc"
 			>
 		</File>
 		<File
-			RelativePath="browser_distribution.h"
+			RelativePath=".\browser_distribution.h"
 			>
 		</File>
 		<File
-			RelativePath="copy_tree_work_item.cc"
+			RelativePath=".\copy_tree_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="copy_tree_work_item.h"
+			RelativePath=".\copy_tree_work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="create_dir_work_item.cc"
+			RelativePath=".\create_dir_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="create_dir_work_item.h"
+			RelativePath=".\create_dir_work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="create_reg_key_work_item.cc"
+			RelativePath=".\create_reg_key_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="create_reg_key_work_item.h"
+			RelativePath=".\create_reg_key_work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="delete_reg_value_work_item.cc"
+			RelativePath=".\delete_reg_value_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="delete_reg_value_work_item.h"
+			RelativePath=".\delete_reg_value_work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="delete_tree_work_item.cc"
+			RelativePath=".\delete_tree_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="delete_tree_work_item.h"
+			RelativePath=".\delete_tree_work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="google_chrome_distribution.cc"
+			RelativePath=".\google_chrome_distribution.cc"
 			>
 		</File>
 		<File
-			RelativePath="google_chrome_distribution.h"
+			RelativePath=".\google_chrome_distribution.h"
 			>
 		</File>
 		<File
@@ -185,19 +185,19 @@
 			>
 		</File>
 		<File
-			RelativePath="google_update_settings.cc"
+			RelativePath=".\google_update_settings.cc"
 			>
 		</File>
 		<File
-			RelativePath="google_update_settings.h"
+			RelativePath=".\google_update_settings.h"
 			>
 		</File>
 		<File
-			RelativePath="helper.cc"
+			RelativePath=".\helper.cc"
 			>
 		</File>
 		<File
-			RelativePath="helper.h"
+			RelativePath=".\helper.h"
 			>
 		</File>
 		<File
@@ -209,27 +209,27 @@
 			>
 		</File>
 		<File
-			RelativePath="install_util.cc"
+			RelativePath=".\install_util.cc"
 			>
 		</File>
 		<File
-			RelativePath="install_util.h"
+			RelativePath=".\install_util.h"
 			>
 		</File>
 		<File
-			RelativePath="l10n_string_util.cc"
+			RelativePath=".\l10n_string_util.cc"
 			>
 		</File>
 		<File
-			RelativePath="l10n_string_util.h"
+			RelativePath=".\l10n_string_util.h"
 			>
 		</File>
 		<File
-			RelativePath="logging_installer.cc"
+			RelativePath=".\logging_installer.cc"
 			>
 		</File>
 		<File
-			RelativePath="logging_installer.h"
+			RelativePath=".\logging_installer.h"
 			>
 		</File>
 		<File
@@ -249,11 +249,11 @@
 			>
 		</File>
 		<File
-			RelativePath="set_reg_value_work_item.cc"
+			RelativePath=".\set_reg_value_work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="set_reg_value_work_item.h"
+			RelativePath=".\set_reg_value_work_item.h"
 			>
 		</File>
 		<File
@@ -265,35 +265,35 @@
 			>
 		</File>
 		<File
-			RelativePath="util_constants.cc"
+			RelativePath=".\util_constants.cc"
 			>
 		</File>
 		<File
-			RelativePath="util_constants.h"
+			RelativePath=".\util_constants.h"
 			>
 		</File>
 		<File
-			RelativePath="version.cc"
+			RelativePath=".\version.cc"
 			>
 		</File>
 		<File
-			RelativePath="version.h"
+			RelativePath=".\version.h"
 			>
 		</File>
 		<File
-			RelativePath="work_item.cc"
+			RelativePath=".\work_item.cc"
 			>
 		</File>
 		<File
-			RelativePath="work_item.h"
+			RelativePath=".\work_item.h"
 			>
 		</File>
 		<File
-			RelativePath="work_item_list.cc"
+			RelativePath=".\work_item_list.cc"
 			>
 		</File>
 		<File
-			RelativePath="work_item_list.h"
+			RelativePath=".\work_item_list.h"
 			>
 		</File>
 	</Files>
diff --git a/chrome/test/automation/automation.vcproj b/chrome/test/automation/automation.vcproj
index 38781fc..1f2f3e2 100644
--- a/chrome/test/automation/automation.vcproj
+++ b/chrome/test/automation/automation.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="automation"
 	ProjectGUID="{1556EF78-C7E6-43C8-951F-F6B43AC0DD12}"
+	RootNamespace="automation"
 	>
 	<Platforms>
 		<Platform
diff --git a/chrome/tools/test/image_diff/image_diff.vcproj b/chrome/tools/test/image_diff/image_diff.vcproj
index 77f36ac..e4544be 100644
--- a/chrome/tools/test/image_diff/image_diff.vcproj
+++ b/chrome/tools/test/image_diff/image_diff.vcproj
@@ -12,6 +12,8 @@
 			Name="Win32"
 		/>
 	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
@@ -40,10 +42,14 @@
 			/>
 		</Configuration>
 	</Configurations>
+	<References>
+	</References>
 	<Files>
 		<File
 			RelativePath=".\image_diff.cc"
 			>
 		</File>
 	</Files>
+	<Globals>
+	</Globals>
 </VisualStudioProject>