diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:10:56 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-11 23:10:56 +0000 |
| commit | 50285fffa5e44c61cbf6141908c6297fbd0b20d4 (patch) | |
| tree | 5fb535a307298d93e4c885c40856303784cbf543 /chrome/test/startup/startup_test.cc | |
| parent | 1ad795b4c02d1fd42743252685bd411619a2d4e2 (diff) | |
| download | chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.zip chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.tar.gz chromium_src-50285fffa5e44c61cbf6141908c6297fbd0b20d4.tar.bz2 | |
Remove Gears from Chrome.
There are probably a few more bits and pieces that can be removed, but I think this is the majority of it.
BUG=51934
Review URL: http://codereview.chromium.org/6576020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup/startup_test.cc')
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 8e0e826..9cc8541 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); |
