Move most extension feature unit tests to extensions_unittests

extensions/common/features/complex_feature_unittest.cc

Index: extensions/common/features/complex_feature_unittest.cc
diff --git a/extensions/common/features/complex_feature_unittest.cc b/extensions/common/features/complex_feature_unittest.cc
index 54e5286342d101e42a71dba0528d1ab1304d5122..0f8a9ea4e53ee65c655f9e04340e3719beb56905 100644
--- a/extensions/common/features/complex_feature_unittest.cc
+++ b/extensions/common/features/complex_feature_unittest.cc
@@ -4,48 +4,23 @@
 
 #include "extensions/common/features/complex_feature.h"
 
-#include "chrome/common/extensions/features/chrome_channel_feature_filter.h"
-#include "chrome/common/extensions/features/feature_channel.h"
+#include <string>
+
 #include "extensions/common/features/simple_feature.h"
+#include "extensions/common/manifest.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-using chrome::VersionInfo;
-using extensions::ComplexFeature;
-using extensions::DictionaryBuilder;
-using extensions::Feature;
-using extensions::ListBuilder;
-using extensions::Manifest;
-using extensions::ScopedCurrentChannel;
-using extensions::SimpleFeature;
-
-namespace {
-
-class ExtensionComplexFeatureTest : public testing::Test {
- protected:
-  ExtensionComplexFeatureTest()
-      : current_channel_(VersionInfo::CHANNEL_UNKNOWN) {}
-  virtual ~ExtensionComplexFeatureTest() {}
-
-  SimpleFeature* CreateFeature() {
-    SimpleFeature* feature = new SimpleFeature();
-    feature->AddFilter(scoped_ptr<extensions::SimpleFeatureFilter>(
-        new extensions::ChromeChannelFeatureFilter(feature)));
-    return feature;
-  }
-
- private:
-  ScopedCurrentChannel current_channel_;
-};
-
-TEST_F(ExtensionComplexFeatureTest, MultipleRulesWhitelist) {
+namespace extensions {
+
+TEST(ComplexFeatureTest, MultipleRulesWhitelist) {
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
   scoped_ptr<ComplexFeature::FeatureList> features(
       new ComplexFeature::FeatureList());
 
   // Rule: "extension", whitelist "foo".
-  scoped_ptr<SimpleFeature> simple_feature(CreateFeature());
+  scoped_ptr<SimpleFeature> simple_feature(new SimpleFeature);
   scoped_ptr<base::DictionaryValue> rule(
       DictionaryBuilder()
       .Set("whitelist", ListBuilder().Append(kIdFoo))
@@ -55,7 +30,7 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesWhitelist) {
   features->push_back(simple_feature.release());
 
   // Rule: "legacy_packaged_app", whitelist "bar".
-  simple_feature.reset(CreateFeature());
+  simple_feature.reset(new SimpleFeature);
   rule = DictionaryBuilder()
       .Set("whitelist", ListBuilder().Append(kIdBar))
       .Set("extension_types", ListBuilder()
@@ -100,83 +75,23 @@ TEST_F(ExtensionComplexFeatureTest, MultipleRulesWhitelist) {
                                      Feature::GetCurrentPlatform()).result());
 }
 
-TEST_F(ExtensionComplexFeatureTest, MultipleRulesChannels) {
-  scoped_ptr<ComplexFeature::FeatureList> features(
-      new ComplexFeature::FeatureList());
-
-  // Rule: "extension", channel trunk.
-  scoped_ptr<SimpleFeature> simple_feature(CreateFeature());
-  scoped_ptr<base::DictionaryValue> rule(
-      DictionaryBuilder()
-      .Set("channel", "trunk")
-      .Set("extension_types", ListBuilder().Append("extension")).Build());
-  simple_feature->Parse(rule.get());
-  features->push_back(simple_feature.release());
-
-  // Rule: "legacy_packaged_app", channel stable.
-  simple_feature.reset(CreateFeature());
-  rule = DictionaryBuilder()
-      .Set("channel", "stable")
-      .Set("extension_types", ListBuilder()
-          .Append("legacy_packaged_app")).Build();
-  simple_feature->Parse(rule.get());
-  features->push_back(simple_feature.release());
-
-  scoped_ptr<ComplexFeature> feature(new ComplexFeature(features.Pass()));
-
-  // Test match 1st rule.
-  {
-    ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_UNKNOWN);
-    EXPECT_EQ(
-        Feature::IS_AVAILABLE,
-        feature->IsAvailableToManifest("1",
-                                       Manifest::TYPE_EXTENSION,
-                                       Manifest::INVALID_LOCATION,
-                                       Feature::UNSPECIFIED_PLATFORM,
-                                       Feature::GetCurrentPlatform()).result());
-  }
-
-  // Test match 2nd rule.
-  {
-    ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
-    EXPECT_EQ(
-        Feature::IS_AVAILABLE,
-        feature->IsAvailableToManifest("2",
-                                       Manifest::TYPE_LEGACY_PACKAGED_APP,
-                                       Manifest::INVALID_LOCATION,
-                                       Feature::UNSPECIFIED_PLATFORM,
-                                       Feature::GetCurrentPlatform()).result());
-  }
-
-  // Test feature not available to extensions above channel unknown.
-  {
-    ScopedCurrentChannel current_channel(VersionInfo::CHANNEL_BETA);
-    EXPECT_NE(
-        Feature::IS_AVAILABLE,
-        feature->IsAvailableToManifest("1",
-                                       Manifest::TYPE_EXTENSION,
-                                       Manifest::INVALID_LOCATION,
-                                       Feature::UNSPECIFIED_PLATFORM,
-                                       Feature::GetCurrentPlatform()).result());
-  }
-}
-
 // Tests that dependencies are correctly checked.
-TEST_F(ExtensionComplexFeatureTest, Dependencies) {
+TEST(ComplexFeatureTest, Dependencies) {
   scoped_ptr<ComplexFeature::FeatureList> features(
       new ComplexFeature::FeatureList());
 
-  // Rule which depends on an extension-only feature (omnibox).
-  scoped_ptr<SimpleFeature> simple_feature(CreateFeature());
+  // Rule which depends on an extension-only feature (content_security_policy).
+  scoped_ptr<SimpleFeature> simple_feature(new SimpleFeature);
   scoped_ptr<base::DictionaryValue> rule =
       DictionaryBuilder()
-          .Set("dependencies", ListBuilder().Append("manifest:omnibox"))
+          .Set("dependencies",
+               ListBuilder().Append("manifest:content_security_policy"))
           .Build();
   simple_feature->Parse(rule.get());
   features->push_back(simple_feature.release());
 
   // Rule which depends on an platform-app-only feature (serial).
-  simple_feature.reset(CreateFeature());
+  simple_feature.reset(new SimpleFeature);
   rule = DictionaryBuilder()
              .Set("dependencies", ListBuilder().Append("permission:serial"))
              .Build();
@@ -185,7 +100,7 @@ TEST_F(ExtensionComplexFeatureTest, Dependencies) {
 
   scoped_ptr<ComplexFeature> feature(new ComplexFeature(features.Pass()));
 
-  // Available to extensions because of the omnibox rule.
+  // Available to extensions because of the content_security_policy rule.
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature->IsAvailableToManifest("extensionid",
@@ -194,7 +109,7 @@ TEST_F(ExtensionComplexFeatureTest, Dependencies) {
                                      Feature::UNSPECIFIED_PLATFORM,
                                      Feature::GetCurrentPlatform()).result());
 
-  // Available to platofrm apps because of the serial rule.
+  // Available to platform apps because of the serial rule.
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature->IsAvailableToManifest("platformappid",
@@ -213,4 +128,4 @@ TEST_F(ExtensionComplexFeatureTest, Dependencies) {
                                      Feature::GetCurrentPlatform()).result());
 }
 
-}  // namespace
+}  // namespace extensions