summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 21:50:36 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-24 21:50:36 +0000
commitf6f49490e29b04343a239dcb625c4e89dd02300f (patch)
tree3bc042b02615c2215effe47300f9bf8a97f40c4f /chrome_frame/test
parent36df22b48817bc7fe7159e498f65b5e8b00f1605 (diff)
downloadchromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.zip
chromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.tar.gz
chromium_src-f6f49490e29b04343a239dcb625c4e89dd02300f.tar.bz2
ICU 4.6 upgrade chrome changes in phase 2
A bunch of hard-coded references to icudt42.dll are updated to refer to icudt46.dll. See also http://codereview.chromium.org/6575042/ (and there's one more accompanying CL - internal). I'll follow up this CL with a change to rename icudtXX.dll to icudt.dll so that I don't have to do this again next time. BUG=73991,61514 TEST=daily archived builds have icudt46.dll Review URL: http://codereview.chromium.org/6580046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
-rw-r--r--chrome_frame/test/perf/chrome_frame_perftest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index e83bf65..0e817a8 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("icudt42.dll"));
+ icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt46.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"));