summaryrefslogtreecommitdiffstats
path: root/googleurl
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2011-06-28 21:49:31 +0100
committerKristian Monsen <kristianm@google.com>2011-07-08 17:55:00 +0100
commitddb351dbec246cf1fab5ec20d2d5520909041de1 (patch)
tree158e3fb57bdcac07c7f1e767fde3c70687c9fbb1 /googleurl
parent6b92e04f5f151c896e3088e86f70db7081009308 (diff)
downloadexternal_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.zip
external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.gz
external_chromium-ddb351dbec246cf1fab5ec20d2d5520909041de1.tar.bz2
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
Diffstat (limited to 'googleurl')
-rw-r--r--googleurl/src/gurl_test_main.cc11
1 files changed, 8 insertions, 3 deletions
diff --git a/googleurl/src/gurl_test_main.cc b/googleurl/src/gurl_test_main.cc
index 9a7c9f4..43f19df 100644
--- a/googleurl/src/gurl_test_main.cc
+++ b/googleurl/src/gurl_test_main.cc
@@ -63,9 +63,14 @@ bool InitializeICU() {
#if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
// We expect to find the ICU data module alongside the current module.
// Because the module name is ASCII-only, "A" API should be safe.
- HMODULE module = LoadLibraryA(ICU_UTIL_DATA_SHARED_MODULE_NAME);
- if (!module)
- return false;
+ // Chrome's copy of ICU dropped a version number XX from icudt dll,
+ // but 3rd-party embedders may need it. So, we try both.
+ HMODULE module = LoadLibraryA("icudt.dll");
+ if (!module) {
+ module = LoadLibraryA(ICU_UTIL_DATA_SHARED_MODULE_NAME);
+ if (!module)
+ return false;
+ }
FARPROC addr = GetProcAddress(module, ICU_UTIL_DATA_SYMBOL);
if (!addr)