Consolidate manifest handler registration.

chrome/browser/extensions/extension_ui_unittest.cc

Index: chrome/browser/extensions/extension_ui_unittest.cc
diff --git a/chrome/browser/extensions/extension_ui_unittest.cc b/chrome/browser/extensions/extension_ui_unittest.cc
index a896508c85db9e4049d87b04be1c29f7319c796e..10b3eccc4e86a2790f4b1cf9747288371e009892 100644
--- a/chrome/browser/extensions/extension_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_ui_unittest.cc
@@ -13,8 +13,6 @@
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/extension_unittest.h"
-#include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/constants.h"
@@ -29,7 +27,7 @@
 using extensions::Extension;
 using extensions::Manifest;
 
-class ExtensionUITest : public extensions::ExtensionTest {
+class ExtensionUITest : public testing::Test {
  public:
   ExtensionUITest()
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
@@ -37,8 +35,6 @@ class ExtensionUITest : public extensions::ExtensionTest {
 
  protected:
   virtual void SetUp() OVERRIDE {
-    ExtensionTest::SetUp();
-
     // Create an ExtensionService and ManagementPolicy to inject into the
     // ExtensionSettingsHandler.
     profile_.reset(new TestingProfile());
@@ -51,8 +47,6 @@ class ExtensionUITest : public extensions::ExtensionTest {
 
     handler_.reset(new ExtensionSettingsHandler(extension_service_,
                                                 management_policy_));
-
-    (new extensions::ContentScriptsHandler)->Register();
   }
 
   virtual void TearDown() OVERRIDE {
@@ -60,7 +54,6 @@ class ExtensionUITest : public extensions::ExtensionTest {
     profile_.reset();
     // Execute any pending deletion tasks.
     message_loop_.RunUntilIdle();
-    ExtensionTest::TearDown();
   }
 
   static DictionaryValue* DeserializeJSONTestData(const base::FilePath& path,