Move Requirements out of Extension Class

chrome/browser/devtools/devtools_sanity_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 "base/bind.h"
 #include "base/cancelable_callback.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.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/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"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_http_handler.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/notification_registrar.h"
@@ skipping 148 matching lines @@
     test_extensions_dir_ = test_extensions_dir_.AppendASCII("extensions");
   }
 
  protected:
   // Load an extension from test\data\devtools\extensions\<extension_name>
   void LoadExtension(const char* extension_name) {
     base::FilePath path = test_extensions_dir_.AppendASCII(extension_name);
     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(
         browser()->profile())->extension_service();
     size_t num_before = service->extensions()->size();
     {
       content::NotificationRegistrar registrar;
       registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                     content::NotificationService::AllSources());
       base::CancelableClosure timeout(
@@ skipping 474 matching lines @@
     devtools_http_handler_->Stop();
     return result;
   }
 };
 
 IN_PROC_BROWSER_TEST_F(DISABLED_RemoteDebuggingTest, TargetList) {
   ASSERT_TRUE(RunExtensionTest("target_list"));
 }
 
 }  // namespace