Move Requirements out of Extension Class

chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc
index dde2cf010cd29e81873cf8e95cc44db3f0ad35be..defd8eee08b806ed6af7b67a4fc046d88b025cc2 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_requirements_unittest.cc
@@ -2,17 +2,27 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
-
+#include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handlers/requirements_handler.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
 #include "extensions/common/error_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extension_manifest_errors;
 
-using extensions::ErrorUtils;
+namespace extensions {
 
-TEST_F(ExtensionManifestTest, RequirementsInvalid) {
+class RequirementsManifestTest : public ExtensionManifestTest {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    ExtensionManifestTest::SetUp();
+    (new PluginsHandler)->Register();
+    (new RequirementsHandler)->Register();
+  }
+};
+
+TEST_F(RequirementsManifestTest, RequirementsInvalid) {
   Testcase testcases[] = {
     Testcase("requirements_invalid_requirements.json",
              errors::kInvalidRequirements),
@@ -43,49 +53,51 @@ TEST_F(ExtensionManifestTest, RequirementsInvalid) {
   RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR);
 }
 
-TEST_F(ExtensionManifestTest, RequirementsValid) {
+TEST_F(RequirementsManifestTest, RequirementsValid) {
   // Test the defaults.
-  scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
+  scoped_refptr<Extension> extension(LoadAndExpectSuccess(
       "requirements_valid_empty.json"));
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, false);
-  EXPECT_EQ(extension->requirements().css3d, false);
-  EXPECT_EQ(extension->requirements().npapi, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);
 
   // Test loading all the requirements.
   extension = LoadAndExpectSuccess("requirements_valid_full.json");
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, true);
-  EXPECT_EQ(extension->requirements().css3d, true);
-  EXPECT_EQ(extension->requirements().npapi, true);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, true);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, true);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);
 }
 
 // When an npapi plugin is present, the default of the "npapi" requirement
 // changes.
-TEST_F(ExtensionManifestTest, RequirementsNpapiDefault) {
-  scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
+TEST_F(RequirementsManifestTest, RequirementsNpapiDefault) {
+  scoped_refptr<Extension> extension(LoadAndExpectSuccess(
       "requirements_npapi_empty.json"));
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, false);
-  EXPECT_EQ(extension->requirements().css3d, false);
-  EXPECT_EQ(extension->requirements().npapi, true);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);
 
   extension = LoadAndExpectSuccess(
       "requirements_npapi_empty_plugins_empty.json");
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, false);
-  EXPECT_EQ(extension->requirements().css3d, false);
-  EXPECT_EQ(extension->requirements().npapi, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);
 
   extension = LoadAndExpectSuccess("requirements_npapi.json");
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, false);
-  EXPECT_EQ(extension->requirements().css3d, false);
-  EXPECT_EQ(extension->requirements().npapi, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, false);
 
   extension = LoadAndExpectSuccess("requirements_npapi_plugins_empty.json");
   ASSERT_TRUE(extension.get());
-  EXPECT_EQ(extension->requirements().webgl, false);
-  EXPECT_EQ(extension->requirements().css3d, false);
-  EXPECT_EQ(extension->requirements().npapi, true);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).webgl, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).css3d, false);
+  EXPECT_EQ(RequirementsInfo::GetRequirements(extension).npapi, true);
 }
+
+}  // namespace extensions