Revert 16173

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

9 files changed, 313 insertions, 318 deletions

diff --git a/app/DEPS b/app/DEPS
index da89e8e..cffa9e0 100644
--- a/app/DEPS
+++ b/app/DEPS
@@ -4,5 +4,8 @@ include_rules = [
   "+grit/locale_settings.h",
   "+grit/theme_resources.h",
   "+net",
+  # TODO(beng): Sever these links once we have extracted all deps from
+  # chrome/common.
+  "+chrome/common/chrome_paths.h",
   "+skia",
 ]
diff --git a/app/app.vcproj b/app/app.vcproj
index f54461a..92b555c 100644
--- a/app/app.vcproj
+++ b/app/app.vcproj
@@ -1,303 +1,295 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="app"
-	ProjectGUID="{4631946D-7D5F-44BD-A5A8-504C0A7033BE}"
-	RootNamespace="app"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\debug.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="4"
-			InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\release.vsprops"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="gfx"
-			>
-			<File
-				RelativePath=".\gfx\canvas.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\canvas.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\canvas_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\color_utils.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\color_utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\favicon_size.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\font.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\font_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\icon_util.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\icon_util.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\insets.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\path.h"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\path_win.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\text_elider.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\gfx\text_elider.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\animation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\app_paths.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\app_paths.h"
-			>
-		</File>
-		<File
-			RelativePath=".\app_switches.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\app_switches.h"
-			>
-		</File>
-		<File
-			RelativePath=".\drag_drop_types.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\drag_drop_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\l10n_util.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\l10n_util.h"
-			>
-		</File>
-		<File
-			RelativePath=".\l10n_util_win.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\l10n_util_win.h"
-			>
-		</File>
-		<File
-			RelativePath=".\message_box_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\os_exchange_data.h"
-			>
-		</File>
-		<File
-			RelativePath=".\os_exchange_data_win.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\resource_bundle.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\resource_bundle.h"
-			>
-		</File>
-		<File
-			RelativePath=".\resource_bundle_win.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\slide_animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\slide_animation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\theme_provider.h"
-			>
-		</File>
-		<File
-			RelativePath=".\throb_animation.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\throb_animation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_model.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_node_iterator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tree_node_model.h"
-			>
-		</File>
-		<File
-			RelativePath=".\win_util.cc"
-			>
-		</File>
-		<File
-			RelativePath=".\win_util.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="8.00"

+	Name="app"

+	ProjectGUID="{4631946D-7D5F-44BD-A5A8-504C0A7033BE}"

+	RootNamespace="app"

+	Keyword="Win32Proj"

+	>

+	<Platforms>

+		<Platform

+			Name="Win32"

+		/>

+	</Platforms>

+	<ToolFiles>

+	</ToolFiles>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\debug.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			ConfigurationType="4"

+			InheritedPropertySheets=".\app.vsprops;$(SolutionDir)..\build\release.vsprops"

+			>

+			<Tool

+				Name="VCPreBuildEventTool"

+			/>

+			<Tool

+				Name="VCCustomBuildTool"

+			/>

+			<Tool

+				Name="VCXMLDataGeneratorTool"

+			/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"

+			/>

+			<Tool

+				Name="VCMIDLTool"

+			/>

+			<Tool

+				Name="VCCLCompilerTool"

+			/>

+			<Tool

+				Name="VCManagedResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCResourceCompilerTool"

+			/>

+			<Tool

+				Name="VCPreLinkEventTool"

+			/>

+			<Tool

+				Name="VCLibrarianTool"

+			/>

+			<Tool

+				Name="VCALinkTool"

+			/>

+			<Tool

+				Name="VCXDCMakeTool"

+			/>

+			<Tool

+				Name="VCBscMakeTool"

+			/>

+			<Tool

+				Name="VCFxCopTool"

+			/>

+			<Tool

+				Name="VCPostBuildEventTool"

+			/>

+		</Configuration>

+	</Configurations>

+	<References>

+	</References>

+	<Files>

+		<Filter

+			Name="gfx"

+			>

+			<File

+				RelativePath=".\gfx\canvas.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\canvas.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\canvas_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\color_utils.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\color_utils.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\favicon_size.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\font.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\font_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\icon_util.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\icon_util.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\insets.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\path.h"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\path_win.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\text_elider.cc"

+				>

+			</File>

+			<File

+				RelativePath=".\gfx\text_elider.h"

+				>

+			</File>

+		</Filter>

+		<File

+			RelativePath=".\animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\animation.h"

+			>

+		</File>

+		<File

+			RelativePath=".\app_switches.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\app_switches.h"

+			>

+		</File>

+		<File

+			RelativePath=".\drag_drop_types.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\drag_drop_types.h"

+			>

+		</File>

+		<File

+			RelativePath=".\l10n_util.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\l10n_util.h"

+			>

+		</File>

+		<File

+			RelativePath=".\l10n_util_win.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\l10n_util_win.h"

+			>

+		</File>

+		<File

+			RelativePath=".\message_box_flags.h"

+			>

+		</File>

+		<File

+			RelativePath=".\os_exchange_data.h"

+			>

+		</File>

+		<File

+			RelativePath=".\os_exchange_data_win.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\resource_bundle.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\resource_bundle.h"

+			>

+		</File>

+		<File

+			RelativePath=".\resource_bundle_win.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\slide_animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\slide_animation.h"

+			>

+		</File>

+		<File

+			RelativePath=".\theme_provider.h"

+			>

+		</File>

+		<File

+			RelativePath=".\throb_animation.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\throb_animation.h"

+			>

+		</File>

+		<File

+			RelativePath=".\tree_model.h"

+			>

+		</File>

+		<File

+			RelativePath=".\tree_node_iterator.h"

+			>

+		</File>

+		<File

+			RelativePath=".\tree_node_model.h"

+			>

+		</File>

+		<File

+			RelativePath=".\win_util.cc"

+			>

+		</File>

+		<File

+			RelativePath=".\win_util.h"

+			>

+		</File>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/app/gfx/icon_util_unittest.cc b/app/gfx/icon_util_unittest.cc
index 27f749d..ed65ca52 100644
--- a/app/gfx/icon_util_unittest.cc
+++ b/app/gfx/icon_util_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/app_paths.h"
 #include "app/gfx/icon_util.h"
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
+#include "chrome/common/chrome_paths.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -20,7 +20,7 @@ namespace {
   class IconUtilTest : public testing::Test {
    public:
     IconUtilTest() {
-      PathService::Get(app::DIR_TEST_DATA, &test_data_directory_);
+      PathService::Get(chrome::DIR_TEST_DATA, &test_data_directory_);
     }
     ~IconUtilTest() {}
 
diff --git a/app/l10n_util.cc b/app/l10n_util.cc
index 8791024..611c21a 100644
--- a/app/l10n_util.cc
+++ b/app/l10n_util.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 
-#include "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
@@ -18,6 +17,7 @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
+#include "chrome/common/chrome_paths.h"
 #include "unicode/uscript.h"
 
 // TODO(playmobil): remove this undef once SkPostConfig.h is fixed.
@@ -229,7 +229,7 @@ std::wstring GetApplicationLocale(const std::wstring& pref_locale) {
   return L"en";
 #else
   FilePath locale_path;
-  PathService::Get(app::DIR_LOCALES, &locale_path);
+  PathService::Get(chrome::DIR_LOCALES, &locale_path);
   std::wstring resolved_locale;
 
   // First, check to see if there's a --lang flag.
diff --git a/app/l10n_util_unittest.cc b/app/l10n_util_unittest.cc
index 3503c096..b1f8c93 100644
--- a/app/l10n_util_unittest.cc
+++ b/app/l10n_util_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "build/build_config.h"
 
-#include "app/app_paths.h"
 #include "app/l10n_util.h"
 #if !defined(OS_MACOSX)
 #include "app/test/data/resource.h"
@@ -17,6 +16,7 @@
 #if defined(OS_WIN)
 #include "base/win_util.h"
 #endif
+#include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "unicode/locid.h"
@@ -100,12 +100,12 @@ TEST_F(L10nUtilTest, GetAppLocale) {
   // Use a temporary locale dir so we don't have to actually build the locale
   // dlls for this test.
   FilePath orig_locale_dir;
-  PathService::Get(app::DIR_LOCALES, &orig_locale_dir);
+  PathService::Get(chrome::DIR_LOCALES, &orig_locale_dir);
   FilePath new_locale_dir;
   EXPECT_TRUE(file_util::CreateNewTempDirectory(
       FILE_PATH_LITERAL("l10n_util_test"),
       &new_locale_dir));
-  PathService::Override(app::DIR_LOCALES, new_locale_dir.ToWStringHack());
+  PathService::Override(chrome::DIR_LOCALES, new_locale_dir.ToWStringHack());
   // Make fake locale files.
   std::string filenames[] = {
     "en-US",
@@ -204,7 +204,7 @@ TEST_F(L10nUtilTest, GetAppLocale) {
 #endif
 
   // Clean up.
-  PathService::Override(app::DIR_LOCALES, orig_locale_dir.ToWStringHack());
+  PathService::Override(chrome::DIR_LOCALES, orig_locale_dir.ToWStringHack());
   file_util::Delete(new_locale_dir, true);
   UErrorCode error_code = U_ZERO_ERROR;
   Locale::setDefault(locale, error_code);
diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc
index e27c7b6..6f4b43f 100644
--- a/app/resource_bundle_linux.cc
+++ b/app/resource_bundle_linux.cc
@@ -6,7 +6,6 @@
 
 #include <gtk/gtk.h>
 
-#include "app/app_paths.h"
 #include "app/gfx/font.h"
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
@@ -19,7 +18,8 @@
 #include "base/path_service.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
-#include "third_party/skia/include/core/SkBitmap.h"
+#include "chrome/common/chrome_paths.h"
+#include "SkBitmap.h"
 
 namespace {
 
@@ -94,7 +94,7 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
-  PathService::Get(app::DIR_LOCALES, &locale_path);
+  PathService::Get(chrome::DIR_LOCALES, &locale_path);
 
   const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
@@ -105,7 +105,7 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
 
 void ResourceBundle::LoadThemeResources() {
   FilePath theme_data_path;
-  PathService::Get(app::DIR_THEMES, &theme_data_path);
+  PathService::Get(chrome::DIR_THEMES, &theme_data_path);
   theme_data_path = theme_data_path.Append(FILE_PATH_LITERAL("default.pak"));
   theme_data_ = new base::DataPack;
   bool success = theme_data_->Load(theme_data_path);
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc
index 82f34b0..1d0d28f 100644
--- a/app/resource_bundle_win.cc
+++ b/app/resource_bundle_win.cc
@@ -6,7 +6,6 @@
 
 #include <atlbase.h>
 
-#include "app/app_paths.h"
 #include "app/gfx/font.h"
 #include "app/l10n_util.h"
 #include "base/file_util.h"
@@ -15,6 +14,7 @@
 #include "base/resource_util.h"
 #include "base/string_piece.h"
 #include "base/win_util.h"
+#include "chrome/common/chrome_paths.h"
 
 namespace {
 
@@ -63,7 +63,7 @@ void ResourceBundle::LoadResources(const std::wstring& pref_locale) {
 
 FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
   FilePath locale_path;
-  PathService::Get(app::DIR_LOCALES, &locale_path);
+  PathService::Get(chrome::DIR_LOCALES, &locale_path);
 
   const std::wstring app_locale = l10n_util::GetApplicationLocale(pref_locale);
   if (app_locale.empty())
@@ -75,7 +75,7 @@ FilePath ResourceBundle::GetLocaleFilePath(const std::wstring& pref_locale) {
 void ResourceBundle::LoadThemeResources() {
   DCHECK(NULL == theme_data_) << "theme dll already loaded";
   std::wstring theme_data_path;
-  PathService::Get(app::DIR_THEMES, &theme_data_path);
+  PathService::Get(chrome::DIR_THEMES, &theme_data_path);
   file_util::AppendToPath(&theme_data_path, L"default.dll");
 
   // The dll should only have resources, not executable code.
diff --git a/app/test/data/icon_util/128_X_128_icon.ico b/app/test/data/icon_util/128_X_128_icon.ico
deleted file mode 100644
index a5d72fe..0000000
--- a/app/test/data/icon_util/128_X_128_icon.ico
+++ /dev/null
diff --git a/app/test/data/icon_util/16_X_16_icon.ico b/app/test/data/icon_util/16_X_16_icon.ico
deleted file mode 100644
index 0e524f1..0000000
--- a/app/test/data/icon_util/16_X_16_icon.ico
+++ /dev/null