Move calls of ManifestHandler::ClearRegistryForTesting to TearDown.

BUG=175665


Review URL: https://chromiumcodereview.appspot.com/12220122

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

chrome/browser/extensions/extension_service_unittest.cc

@@ -546,12 +546,15 @@ void ExtensionServiceTestBase::SetUpTestCase() {
 void ExtensionServiceTestBase::SetUp() {
   testing::Test::SetUp();
   ExtensionErrorReporter::GetInstance()->ClearErrors();
-  extensions::ManifestHandler::ClearRegistryForTesting();
   extensions::ManifestHandler::Register(
       keys::kDefaultLocale,
       make_linked_ptr(new extensions::DefaultLocaleHandler));
 }
 
+void ExtensionServiceTestBase::TearDown() {
+  extensions::ManifestHandler::ClearRegistryForTesting();
+}
+
 class ExtensionServiceTest
   : public ExtensionServiceTestBase, public content::NotificationObserver {
  public:

chrome/browser/extensions/extension_service_unittest.h

@@ -48,6 +48,8 @@ class ExtensionServiceTestBase : public testing::Test {
 
   virtual void SetUp() OVERRIDE;
 
+  virtual void TearDown() OVERRIDE;
+
   void set_extensions_enabled(bool enabled) {
     service_->set_extensions_enabled(enabled);
   }

chrome/common/extensions/manifest_handler_unittest.cc

@@ -100,7 +100,7 @@ class ManifestHandlerTest : public testing::Test {
   };
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void TearDown() OVERRIDE {
     ManifestHandler::ClearRegistryForTesting();
   }
 };

chrome/common/extensions/manifest_tests/extension_manifest_test.cc

@@ -21,7 +21,7 @@ ExtensionManifestTest::ExtensionManifestTest()
       // UNKNOWN == trunk.
       current_channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {}
 
-void ExtensionManifestTest::SetUp() {
+void ExtensionManifestTest::TearDown() {
   extensions::ManifestHandler::ClearRegistryForTesting();
 }
 

chrome/common/extensions/manifest_tests/extension_manifest_test.h

@@ -18,7 +18,7 @@ class ExtensionManifestTest : public testing::Test {
   ExtensionManifestTest();
 
  protected:
-  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   // If filename is a relative path, LoadManifestFile will treat it relative to
   // the appropriate test directory.