Fix tests that were setting safebrowsing factories without unsetting them.

chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <list>
 
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
@@ skipping 108 matching lines @@
     OK,
     CANCEL
   };
 
   SafeBrowsingBlockingPageTest() {
     ResetUserResponse();
     // The safe browsing UI manager does not need a service for this test.
     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();
   }
 
   void OnBlockingPageComplete(bool proceed) {
     if (proceed)
       user_response_ = OK;
     else
       user_response_ = CANCEL;
   }
 
@@ skipping 509 matching lines @@
 
   EXPECT_TRUE(profile->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 
   // Simulate the user uncheck the report agreement checkbox.
   sb_interstitial->SetReportingPreference(false);
 
   EXPECT_FALSE(profile->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 }