Move Requirements out of Extension Class

chrome/browser/extensions/convert_web_app_browsertest.cc

Index: chrome/browser/extensions/convert_web_app_browsertest.cc
diff --git a/chrome/browser/extensions/convert_web_app_browsertest.cc b/chrome/browser/extensions/convert_web_app_browsertest.cc
index ee5bad335e145b863436d08cd5d55c557fc165c9..0a4fec3cbd2109513c03cfbe605920de49eb3a8c 100644
--- a/chrome/browser/extensions/convert_web_app_browsertest.cc
+++ b/chrome/browser/extensions/convert_web_app_browsertest.cc
@@ -11,8 +11,10 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/icons/icons_handler.h"
+#include "chrome/common/extensions/api/requirements/requirements_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/common/extensions/permissions/permission_set.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -31,6 +33,16 @@ class ExtensionFromWebAppTest
   ExtensionFromWebAppTest() : installed_extension_(NULL) {
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    InProcessBrowserTest::SetUpOnMainThread();
+    (new RequirementsHandler)->Register();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    ManifestHandler::ClearRegistryForTesting();
+    InProcessBrowserTest::CleanUpOnMainThread();
+  }
+
   std::string expected_extension_id_;
   const Extension* installed_extension_;