Fix tests that were setting safebrowsing factories without unsetting them.

BUG=313141
R=shess@chromium.org, tburkard@chromium.org

Review URL: https://codereview.chromium.org/55323002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232882 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 18 insertions, 4 deletions

diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index 7382b14..01e0fad 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -726,6 +726,12 @@ class PrerenderBrowserTest : virtual public InProcessBrowserTest {
 #endif
   }
 
+  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
+#if defined(FULL_SAFE_BROWSING)
+    SafeBrowsingService::RegisterFactory(NULL);
+#endif
+  }
+
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitchASCII(switches::kPrerenderMode,
                                     switches::kPrerenderModeSwitchValueEnabled);
diff --git a/chrome/browser/safe_browsing/database_manager_unittest.cc b/chrome/browser/safe_browsing/database_manager_unittest.cc
index 9c425a6..192c692 100644
--- a/chrome/browser/safe_browsing/database_manager_unittest.cc
+++ b/chrome/browser/safe_browsing/database_manager_unittest.cc
@@ -39,10 +39,16 @@ class TestSafeBrowsingServiceFactory : public SafeBrowsingServiceFactory {
 class SafeBrowsingDatabaseManagerTest : public PlatformTest {
  public:
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     PlatformTest::SetUp();
     SafeBrowsingService::RegisterFactory(&factory_);
   }
+
+  virtual void TearDown() OVERRIDE {
+    SafeBrowsingService::RegisterFactory(NULL);
+    PlatformTest::TearDown();
+  }
+
   bool RunSBHashTest(const safe_browsing_util::ListType list_type,
                      const std::vector<SBThreatType>& expected_threats,
                      const std::string& result_list);
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index 5f4d322..228873b 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -126,16 +126,18 @@ class SafeBrowsingBlockingPageTest : public ChromeRenderViewHostTestHarness {
     ui_manager_ = new TestSafeBrowsingUIManager(NULL);
   }
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     SafeBrowsingBlockingPage::RegisterFactory(&factory_);
-    MalwareDetails::RegisterFactory(NULL);  // Create it fresh each time.
     ResetUserResponse();
   }
 
-  virtual void TearDown() {
+  virtual void TearDown() OVERRIDE {
     // Release the UI manager before the BrowserThreads are destroyed.
     ui_manager_ = NULL;
+    SafeBrowsingBlockingPage::RegisterFactory(NULL);
+    // Clean up singleton reference (crbug.com/110594).
+    MalwareDetails::RegisterFactory(NULL);
     ChromeRenderViewHostTestHarness::TearDown();
   }