Move Requirements out of Extension Class

chrome/browser/extensions/extension_startup_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 <vector>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.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/extensions/api/requirements/requirements_handler.h"
 #include "chrome/common/extensions/feature_switch.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/net_util.h"
 
-using extensions::FeatureSwitch;
-
 // This file contains high-level startup tests for the extensions system. We've
 // had many silly bugs where command line flags did not get propagated correctly
 // into the services, so we didn't start correctly.
 
+namespace extensions {
+
 class ExtensionStartupTestBase : public InProcessBrowserTest {
  public:
   ExtensionStartupTestBase() :
       enable_extensions_(false),
       override_sideload_wipeout_(FeatureSwitch::sideload_wipeout(), false) {
     num_expected_extensions_ = 3;
   }
 
  protected:
   // InProcessBrowserTest
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+    InProcessBrowserTest::SetUpCommandLine(command_line);
+
     if (!enable_extensions_)
       command_line->AppendSwitch(switches::kDisableExtensions);
 
     if (!load_extensions_.empty()) {
       base::FilePath::StringType paths = JoinString(load_extensions_, ',');
       command_line->AppendSwitchNative(switches::kLoadExtension,
                                        paths);
       command_line->AppendSwitch(switches::kDisableExtensionsFileAccessCheck);
     }
+
+    (new RequirementsHandler)->Register();
+  }
+
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    ManifestHandler::ClearRegistryForTesting();
+    InProcessBrowserTest::CleanUpOnMainThread();
   }
 
   virtual bool SetUpUserDataDirectory() OVERRIDE {
     base::FilePath profile_dir;
     PathService::Get(chrome::DIR_USER_DATA, &profile_dir);
     profile_dir = profile_dir.AppendASCII(TestingProfile::kTestUserProfileDir);
     file_util::CreateDirectory(profile_dir);
 
     preferences_file_ = profile_dir.AppendASCII("Preferences");
     user_scripts_dir_ = profile_dir.AppendASCII("User Scripts");
@@ skipping 17 matching lines @@
 
     // TODO(phajdan.jr): Check return values of the functions below, carefully.
     file_util::Delete(user_scripts_dir_, true);
     file_util::Delete(extensions_dir_, true);
 
     InProcessBrowserTest::TearDown();
   }
 
   void WaitForServicesToStart(int num_expected_extensions,
                               bool expect_extensions_enabled) {
-    ExtensionService* service = extensions::ExtensionSystem::Get(
+    ExtensionService* service = ExtensionSystem::Get(
         browser()->profile())->extension_service();
 
     // Count the number of non-component extensions.
     int found_extensions = 0;
     for (ExtensionSet::const_iterator it = service->extensions()->begin();
          it != service->extensions()->end(); ++it)
-      if ((*it)->location() != extensions::Manifest::COMPONENT)
+      if ((*it)->location() != Manifest::COMPONENT)
         found_extensions++;
 
     ASSERT_EQ(static_cast<uint32>(num_expected_extensions),
               static_cast<uint32>(found_extensions));
     ASSERT_EQ(expect_extensions_enabled, service->extensions_enabled());
 
     content::WindowedNotificationObserver user_scripts_observer(
         chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
-    extensions::UserScriptMaster* master =
-        extensions::ExtensionSystem::Get(browser()->profile())->
+    UserScriptMaster* master = ExtensionSystem::Get(browser()->profile())->
             user_script_master();
     if (!master->ScriptsReady())
       user_scripts_observer.Wait();
     ASSERT_TRUE(master->ScriptsReady());
   }
 
   void TestInjection(bool expect_css, bool expect_script) {
     // Load a page affected by the content script and test to see the effect.
     base::FilePath test_file;
     PathService::Get(chrome::DIR_TEST_DATA, &test_file);
@@ skipping 55 matching lines @@
 #else
 #define MAYBE_NoFileAccess NoFileAccess
 #endif
 // Tests that disallowing file access on an extension prevents it from injecting
 // script into a page with a file URL.
 IN_PROC_BROWSER_TEST_F(ExtensionsStartupTest, MAYBE_NoFileAccess) {
   WaitForServicesToStart(num_expected_extensions_, true);
 
   // Keep a separate list of extensions for which to disable file access, since
   // doing so reloads them.
-  std::vector<const extensions::Extension*> extension_list;
+  std::vector<const Extension*> extension_list;
 
-  ExtensionService* service = extensions::ExtensionSystem::Get(
+  ExtensionService* service = ExtensionSystem::Get(
       browser()->profile())->extension_service();
   for (ExtensionSet::const_iterator it = service->extensions()->begin();
        it != service->extensions()->end(); ++it) {
-    if ((*it)->location() == extensions::Manifest::COMPONENT)
+    if ((*it)->location() == Manifest::COMPONENT)
       continue;
     if (service->AllowFileAccess(*it))
       extension_list.push_back(*it);
   }
 
   for (size_t i = 0; i < extension_list.size(); ++i) {
     content::WindowedNotificationObserver user_scripts_observer(
         chrome::NOTIFICATION_USER_SCRIPTS_UPDATED,
         content::NotificationService::AllSources());
     service->SetAllowFileAccess(extension_list[i], false);
@@ skipping 68 matching lines @@
         .AppendASCII("extensions")
         .AppendASCII("app2");
     load_extensions_.push_back(fourth_extension_path.value());
   }
 };
 
 IN_PROC_BROWSER_TEST_F(ExtensionsLoadMultipleTest, Test) {
   WaitForServicesToStart(4, true);
   TestInjection(true, true);
 }
+
+}  // namespace extensions