Move Requirements out of Extension Class

chrome/browser/extensions/extension_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/extension_browsertest.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/extensions/api/requirements/requirements_handler.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 55 matching lines @@
   // ExtensionService and then the real profile with one, as we do when
   // running on chromeos.
   command_line->AppendSwitchASCII(switches::kLoginUser,
                                   "TestUser@gmail.com");
   command_line->AppendSwitchASCII(switches::kLoginProfile, "user");
 #endif
 }
 
 void ExtensionBrowserTest::SetUpOnMainThread() {
   InProcessBrowserTest::SetUpOnMainThread();
+  // We need to register tbe Requirements handler here because many tests like
+  // this install extensions with CrxInstallers, which need access to
+  // requirements for verification.
+  (new extensions::RequirementsHandler)->Register();
+}
+
+void ExtensionBrowserTest::CleanUpOnMainThread() {
+  extensions::ManifestHandler::ClearRegistryForTesting();
+  InProcessBrowserTest::SetUpOnMainThread();

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

Should be CleanUp (but I don't think you need this, see first comment)

 }
 
 const Extension* ExtensionBrowserTest::LoadExtensionWithFlags(
     const base::FilePath& path, int flags) {
   ExtensionService* service = extensions::ExtensionSystem::Get(
       profile())->extension_service();
   {
     content::NotificationRegistrar registrar;
     registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                   content::NotificationService::AllSources());
@@ skipping 605 matching lines @@
     case content::NOTIFICATION_LOAD_STOP:
       VLOG(1) << "Got LOAD_STOP notification.";
       MessageLoopForUI::current()->Quit();
       break;
 
     default:
       NOTREACHED();
       break;
   }
 }