Move Requirements out of Extension Class

chrome/browser/devtools/devtools_sanity_browsertest.cc

Index: chrome/browser/devtools/devtools_sanity_browsertest.cc
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index b0724a264de5af0ff70ef24bc5b1705e5edcfda8..c5a65ab685a67f4d62d80ea8a62384cfc249c212 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -24,6 +24,8 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/requirements/requirements_handler.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -192,6 +194,16 @@ class DevToolsExtensionTest : public DevToolsSanityTest,
     ASSERT_TRUE(LoadExtensionFromPath(path)) << "Failed to load extension.";
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    DevToolsSanityTest::SetUpOnMainThread();
+    (new extensions::RequirementsHandler)->Register();

[Yoyo Zhou, 2013/03/20 22:41:36]

Unless I'm mistaken, you don't need these in browser tests because they start a
regular Profile with all its services.

(A clue to this is that you're getting a PluginsHandler somehow.)

[Devlin, 2013/03/23 22:28:25]

You're not mistaken; these are unneeded.  I had a problem in the registration
earlier, fixed it, and didn't realize it fixed the problem in all these, too. 
[Browser|API]test changes removed.

+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    extensions::ManifestHandler::ClearRegistryForTesting();
+    DevToolsSanityTest::CleanUpOnMainThread();
+  }
+
  private:
   bool LoadExtensionFromPath(const base::FilePath& path) {
     ExtensionService* service = extensions::ExtensionSystem::Get(