Fix tests that were setting safebrowsing factories without unsetting them.

chrome/browser/safe_browsing/database_manager_unittest.cc

 // Copyright 2013 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 <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/safe_browsing/database_manager.h"
@@ skipping 21 matching lines @@
   virtual SafeBrowsingService* CreateSafeBrowsingService() OVERRIDE {
     return new FakeSafeBrowsingService();
   }
 };
 
 }  // namespace
 
 class SafeBrowsingDatabaseManagerTest : public PlatformTest {
  public:
 
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     PlatformTest::SetUp();
     SafeBrowsingService::RegisterFactory(&factory_);
   }
+
+  virtual void TearDown() OVERRIDE {
+    SafeBrowsingService::RegisterFactory(NULL);

[Scott Hess - ex-Googler, 2013/10/31 22:07:20]

PlatformTest::TearDown() after.

[mattm, 2013/10/31 22:39:23]

Oops, Done.

+  }
+
   bool RunSBHashTest(const safe_browsing_util::ListType list_type,
                      const std::vector<SBThreatType>& expected_threats,
                      const std::string& result_list);
 
  private:
   TestBrowserThreadBundle thread_bundle_;
   TestSafeBrowsingServiceFactory factory_;
 };
 
 bool SafeBrowsingDatabaseManagerTest::RunSBHashTest(
@@ skipping 42 matching lines @@
   std::vector<SBThreatType> multiple_threats;
   multiple_threats.push_back(SB_THREAT_TYPE_URL_MALWARE);
   multiple_threats.push_back(SB_THREAT_TYPE_URL_PHISHING);
   EXPECT_FALSE(RunSBHashTest(safe_browsing_util::MALWARE,
                              multiple_threats,
                              safe_browsing_util::kBinUrlList));
   EXPECT_TRUE(RunSBHashTest(safe_browsing_util::MALWARE,
                             multiple_threats,
                             safe_browsing_util::kMalwareList));
 }