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

2 files changed, 9 insertions, 14 deletions

diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 5cdb77b..a9c2f83 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -187,10 +187,6 @@ void FakeExternalTab::Initialize() {
   DCHECK(g_browser_process == NULL);
   ui::SystemMonitor system_monitor;
 
-  // The gears plugin causes the PluginRequestInterceptor to kick in and it
-  // will cause problems when it tries to intercept URL requests.
-  PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath());
-
   icu_util::Initialize();
 
   app::RegisterPathProvider();
@@ -518,7 +514,6 @@ int main(int argc, char** argv) {
   watchdog.AddObserver(&credentials, "Windows Security", "");
   testing::InitGoogleTest(&argc, argv);
   FilterDisabledTests();
-  PluginService::EnableChromePlugins(false);
   test_suite.RunMainUIThread();
   return 0;
 }
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 3fdbd48..8a82c1a 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);