Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3411)

Unified Diff: chrome_frame/test/perf/chrome_frame_perftest.cc

Issue 6576020: Remove Gears from Chrome (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: windows fixes Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/browser/browser_child_process_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/perf/chrome_frame_perftest.cc
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 3fdbd48ae012d6b159d6b594045a559e19783553..8a82c1a07199c193f95dfbd6fb7a820950f1511f 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -296,8 +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("icudt.dll"));
- gears_dll_ = dir_app_.Append(FILE_PATH_LITERAL("gears.dll"));
+ icu_dll_ = dir_app_.Append(FILE_PATH_LITERAL("icudt46.dll"));
avcodec52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avcodec-52.dll"));
avformat52_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avformat-52.dll"));
avutil50_dll_ = dir_app_.Append(FILE_PATH_LITERAL("avutil-50.dll"));
@@ -358,7 +357,6 @@ class ChromeFrameStartupTest : public ChromeFramePerfTestBase {
FilePath chrome_exe_;
FilePath chrome_frame_dll_;
FilePath icu_dll_;
- FilePath gears_dll_;
FilePath avcodec52_dll_;
FilePath avformat52_dll_;
FilePath avutil50_dll_;
@@ -967,9 +965,10 @@ TEST_F(ChromeFrameBinariesLoadTest, PerfWarm) {
TEST_F(ChromeFrameStartupTestActiveX, PerfCold) {
SetConfigInt(L"PreRead", 0);
- FilePath binaries_to_evict[] = { gears_dll_, avcodec52_dll_,
- avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
- chrome_frame_dll_};
+ FilePath binaries_to_evict[] = {
+ avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
+ chrome_frame_dll_
+ };
RunStartupTest("cold", "t", "about:blank", true /* cold */,
arraysize(binaries_to_evict), binaries_to_evict,
false /* not important */, false);
@@ -978,9 +977,10 @@ TEST_F(ChromeFrameStartupTestActiveX, PerfCold) {
TEST_F(ChromeFrameStartupTestActiveX, PerfColdPreRead) {
SetConfigInt(L"PreRead", 1);
- FilePath binaries_to_evict[] = { gears_dll_, avcodec52_dll_,
- avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
- chrome_frame_dll_};
+ FilePath binaries_to_evict[] = {
+ avcodec52_dll_, avformat52_dll_, avutil50_dll_, chrome_exe_, chrome_dll_,
+ chrome_frame_dll_
+ };
RunStartupTest("cold_preread", "t", "about:blank", true /* cold */,
arraysize(binaries_to_evict), binaries_to_evict,
false /* not important */, false);
« no previous file with comments | « chrome_frame/test/net/fake_external_tab.cc ('k') | content/browser/browser_child_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698