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

Unified Diff: chrome/test/startup/startup_test.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/test/chrome_plugin/test_chrome_plugin.def ('k') | chrome/tools/build/win/FILES » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/startup/startup_test.cc
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 8e0e826408fdbf86b0024df6dbf29fe020359cee..9cc854154b43dcda21aca306ab239d25dc1349ac 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -44,7 +44,7 @@ class StartupTest : public UIPerfTest {
};
// Load a file on startup rather than about:blank. This tests a longer
- // startup path, including resource loading and the loading of gears.dll.
+ // startup path, including resource loading.
void SetUpWithFileURL() {
const FilePath file_url = ui_test_utils::GetTestFilePath(
FilePath(FilePath::kCurrentDirectory),
@@ -141,15 +141,6 @@ class StartupTest : public UIPerfTest {
FilePath chrome_dll(dir_app.Append(FILE_PATH_LITERAL("chrome.dll")));
ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_dll));
#endif
-
-#if defined(OS_WIN)
- // TODO(port): Re-enable once gears is working on mac/linux.
- FilePath gears_dll;
- ASSERT_TRUE(PathService::Get(chrome::FILE_GEARS_PLUGIN, &gears_dll));
- ASSERT_TRUE(EvictFileFromSystemCacheWrapper(gears_dll));
-#else
- NOTIMPLEMENTED() << "gears not enabled yet";
-#endif
}
UITest::SetUp();
TimeTicks end_time = TimeTicks::Now();
@@ -370,21 +361,6 @@ TEST_F(StartupTest, MAYBE_PerfExtensionContentScript50) {
ProxyLauncher::DEFAULT_THEME, 1, 0);
}
-#if defined(OS_WIN)
-// TODO(port): Enable gears tests on linux/mac once gears is working.
-TEST_F(StartupTest, PerfGears) {
- SetUpWithFileURL();
- RunStartupTest("warm", "gears", WARM, NOT_IMPORTANT,
- ProxyLauncher::DEFAULT_THEME, 1, 0);
-}
-
-TEST_F(StartupTest, PerfColdGears) {
- SetUpWithFileURL();
- RunStartupTest("cold", "gears", COLD, NOT_IMPORTANT,
- ProxyLauncher::DEFAULT_THEME, 1, 0);
-}
-#endif
-
TEST_F(StartupTest, PerfComplexTheme) {
RunStartupTest("warm", "t-theme", WARM, NOT_IMPORTANT,
ProxyLauncher::COMPLEX_THEME, 0, 0);
« no previous file with comments | « chrome/test/chrome_plugin/test_chrome_plugin.def ('k') | chrome/tools/build/win/FILES » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698