Drop the icu version number from the name of icu data file on Windows.

This is to avoid having to change a bunch of build/release configuration files
everytime ICU version is changed. 

This will bring in the following two CLs in ICU and googleurl:

http://codereview.chromium.org/6625032
http://codereview.chromium.org/6623060





BUG=74076
TEST=Chrome can be built and a binary built runs fine with an accompanying Chrome CL in place.

Review URL: http://codereview.chromium.org/6624060

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

11 files changed, 18 insertions, 21 deletions

diff --git a/DEPS b/DEPS
index 4ffe651..9c82a4b 100644
--- a/DEPS
+++ b/DEPS
@@ -23,7 +23,7 @@ deps = {
     "/trunk/deps/support@20411",
 
   "src/googleurl":
-    (Var("googlecode_url") % "google-url") + "/trunk@152",
+    (Var("googlecode_url") % "google-url") + "/trunk@153",
 
   "src/seccompsandbox":
     (Var("googlecode_url") % "seccompsandbox") + "/trunk@153",
@@ -48,7 +48,7 @@ deps = {
     "/trunk/deps/third_party/WebKit@76115",
 
   "src/third_party/icu":
-    "/trunk/deps/third_party/icu46@75916",
+    "/trunk/deps/third_party/icu46@77181",
 
   "src/third_party/hunspell":
    "/trunk/deps/third_party/hunspell@65351",
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index eb7a688..4f17f177 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -44,7 +44,7 @@
 #elif ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
 #define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
 #if defined(OS_WIN)
-#define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt" U_ICU_VERSION_SHORT ".dll"
+#define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
 #endif
 #endif
 
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index d566d0a..f58911d 100644
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -197,7 +197,7 @@
                 '<(PRODUCT_DIR)/nacl64.dll',
                 '<(PRODUCT_DIR)/ppGoogleNaClPluginChrome.dll',
                 '<(PRODUCT_DIR)/locales/en-US.dll',
-                '<(PRODUCT_DIR)/icudt46.dll',
+                '<(PRODUCT_DIR)/icudt.dll',
               ],
               'outputs': [
                 'xxx.out',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index d1883e4..aa3589f 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -35,7 +35,7 @@ chrome.dll: %(VersionDir)s\
 nacl64.exe: %(VersionDir)s\
 nacl64.dll: %(VersionDir)s\
 ppGoogleNaClPluginChrome.dll: %(VersionDir)s\
-icudt46.dll: %(VersionDir)s\
+icudt.dll: %(VersionDir)s\
 gears.dll: %(VersionDir)s\
 resources.pak: %(VersionDir)s\
 locales\*.dll: %(VersionDir)s\Locales
diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES
index d9e7e6a..5136ca7 100644
--- a/chrome/tools/build/win/FILES
+++ b/chrome/tools/build/win/FILES
@@ -9,7 +9,7 @@ crash_service.exe
 First Run
 gears.dll
 ppGoogleNaClPluginChrome.dll
-icudt46.dll
+icudt.dll
 locales/ar.dll
 locales/bg.dll
 locales/bn.dll
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index a8f4034..4817b15 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -66,7 +66,7 @@ FILES = [
     'buildtype': ['dev', 'official'],
   },
   {
-    'filename': 'icudt46.dll',
+    'filename': 'icudt.dll',
     'arch': ['32bit', '64bit'],
     'buildtype': ['dev', 'official'],
   },
diff --git a/chrome/tools/build/win/TESTS b/chrome/tools/build/win/TESTS
index 3656046..a3028aa 100644
--- a/chrome/tools/build/win/TESTS
+++ b/chrome/tools/build/win/TESTS
@@ -4,6 +4,7 @@ automated_ui_tests.exe
 icudt38.dll

 icudt42.dll

 icudt46.dll

+icudt.dll

 plugins\npTestNetscapePlugIn.dll

 pyautolib.py

 _pyautolib.pyd

diff --git a/chrome/tools/build/win/server.rules b/chrome/tools/build/win/server.rules
index d49f19d..69f82e4 100644
--- a/chrome/tools/build/win/server.rules
+++ b/chrome/tools/build/win/server.rules
@@ -9,7 +9,7 @@
 			DisplayName="Scan Server DLLs"

 			CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir=&quot;$(OutDir)&quot; --input_file=&quot;$(InputPath)&quot; --header_output_dir=&quot;$(IntDir)&quot; --distribution=$(CHROMIUM_BUILD)"

 			Outputs="$(OutDir)/registered_dlls.h;"

-			AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt46.dll"

+			AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt.dll"

 			FileExtensions="*.release"

 			ExecutionDescription="Scanning for COM Server DLLs..."

 			ShowOnlyRuleProperties="false"

diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 0e817a8..3fdbd48 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -296,7 +296,7 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
     chrome_frame_dll_ = dir_app_.Append(FILE_PATH_LITERAL("servers"));
     chrome_frame_dll_ = chrome_frame_dll_.Append(
         FilePath::FromWStringHack(kChromeFrameDllName));
-    icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt46.dll"));
+    icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt.dll"));
     gears_dll_ = dir_app_.Append(FILE_PATH_LITERAL("gears.dll"));
     avcodec52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avcodec-52.dll"));
     avformat52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avformat-52.dll"));
diff --git a/third_party/sqlite/misc.patch b/third_party/sqlite/misc.patch
index e2f0c55..b90eba5 100644
--- a/third_party/sqlite/misc.patch
+++ b/third_party/sqlite/misc.patch
@@ -1018,9 +1018,9 @@ Index: src/shell_icu_linux.c
 Index: src/shell_icu_win.c
 ===================================================================
 --- src/shell_icu_win.c	1969-12-31 16:00:00.000000000 -0800
-+++ src/shell_icu_win.c	2009-09-09 12:29:11.000000000 -0700
-@@ -0,0 +1,34 @@
-+/* Copyright 2007 Google Inc. All Rights Reserved.
++++ src/shell_icu_win.c	2011-03-03 14:29:11.000000000 -0700
+@@ -0,0 +1,32 @@
++/* Copyright 2011 Google Inc. All Rights Reserved.
 +**/
 +
 +#include <windows.h>
@@ -1038,10 +1038,8 @@ Index: src/shell_icu_win.c
 +  FARPROC addr;
 +  UErrorCode err;
 +
-+  wchar_t dll_name[12];
-+  wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT);
-+  dll_name[11] = L'\0';
-+  module = LoadLibrary(dll_name);
++  // Chrome dropped U_ICU_VERSION_SHORT from the icu data dll name.
++  module = LoadLibrary(L"icudt.dll");
 +  if (!module)
 +    return 0;
 +
diff --git a/third_party/sqlite/src/src/shell_icu_win.c b/third_party/sqlite/src/src/shell_icu_win.c
index afea472..67ebbf4 100644
--- a/third_party/sqlite/src/src/shell_icu_win.c
+++ b/third_party/sqlite/src/src/shell_icu_win.c
@@ -1,4 +1,4 @@
-/* Copyright 2007 Google Inc. All Rights Reserved.
+/* Copyright 2011 Google Inc. All Rights Reserved.
 **/
 
 #include <windows.h>
@@ -16,10 +16,8 @@ int sqlite_shell_init_icu() {
   FARPROC addr;
   UErrorCode err;
 
-  wchar_t dll_name[12];
-  wsprintf(dll_name, L"icudt%2S.dll", U_ICU_VERSION_SHORT);
-  dll_name[11] = L'\0';
-  module = LoadLibrary(dll_name);
+  // Chrome dropped U_ICU_VERSION_SHORT from the icu data dll name.
+  module = LoadLibrary(L"icudt.dll");
   if (!module)
     return 0;