Reland of Further reduction of feature_compiler.py generated code

extensions/common/features/complex_feature_unittest.cc

 // Copyright 2014 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 "extensions/common/features/complex_feature.h"
 
 #include <string>
 #include <utility>
 
 #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"
 
 namespace extensions {
 
 TEST(ComplexFeatureTest, MultipleRulesWhitelist) {
   const std::string kIdFoo("fooabbbbccccddddeeeeffffgggghhhh");
   const std::string kIdBar("barabbbbccccddddeeeeffffgggghhhh");
-  std::unique_ptr<ComplexFeature::FeatureList> features(
-      new ComplexFeature::FeatureList());
+  std::vector<Feature*> features;
 
   // Rule: "extension", whitelist "foo".
   std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature);
   std::unique_ptr<base::DictionaryValue> rule(
       DictionaryBuilder()
           .Set("whitelist", ListBuilder().Append(kIdFoo).Build())
           .Set("extension_types", ListBuilder().Append("extension").Build())
           .Build());
   simple_feature->Parse(rule.get());
-  features->push_back(std::move(simple_feature));
+  features.push_back(simple_feature.release());
 
   // Rule: "legacy_packaged_app", whitelist "bar".
   simple_feature.reset(new SimpleFeature);
   rule = DictionaryBuilder()
              .Set("whitelist", ListBuilder().Append(kIdBar).Build())
              .Set("extension_types",
                   ListBuilder().Append("legacy_packaged_app").Build())
              .Build();
   simple_feature->Parse(rule.get());
-  features->push_back(std::move(simple_feature));
+  features.push_back(simple_feature.release());
 
-  std::unique_ptr<ComplexFeature> feature(
-      new ComplexFeature(std::move(features)));
+  std::unique_ptr<ComplexFeature> feature(new ComplexFeature(&features));
 
   // Test match 1st rule.
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature->IsAvailableToManifest(kIdFoo,
                                      Manifest::TYPE_EXTENSION,
                                      Manifest::INVALID_LOCATION,
                                      Feature::UNSPECIFIED_PLATFORM,
                                      Feature::GetCurrentPlatform()).result());
 
@@ skipping 18 matching lines @@
       Feature::IS_AVAILABLE,
       feature->IsAvailableToManifest(kIdFoo,
                                      Manifest::TYPE_LEGACY_PACKAGED_APP,
                                      Manifest::INVALID_LOCATION,
                                      Feature::UNSPECIFIED_PLATFORM,
                                      Feature::GetCurrentPlatform()).result());
 }
 
 // Tests that dependencies are correctly checked.
 TEST(ComplexFeatureTest, Dependencies) {
-  std::unique_ptr<ComplexFeature::FeatureList> features(
-      new ComplexFeature::FeatureList());
+  std::vector<Feature*> features;
 
   // Rule which depends on an extension-only feature (content_security_policy).
   std::unique_ptr<SimpleFeature> simple_feature(new SimpleFeature);
   std::unique_ptr<base::DictionaryValue> rule =
       DictionaryBuilder()
           .Set("dependencies",
                ListBuilder().Append("manifest:content_security_policy").Build())
           .Build();
   simple_feature->Parse(rule.get());
-  features->push_back(std::move(simple_feature));
+  features.push_back(simple_feature.release());
 
   // Rule which depends on an platform-app-only feature (serial).
   simple_feature.reset(new SimpleFeature);
   rule = DictionaryBuilder()
              .Set("dependencies",
                   ListBuilder().Append("permission:serial").Build())
              .Build();
   simple_feature->Parse(rule.get());
-  features->push_back(std::move(simple_feature));
+  features.push_back(simple_feature.release());
 
-  std::unique_ptr<ComplexFeature> feature(
-      new ComplexFeature(std::move(features)));
+  std::unique_ptr<ComplexFeature> feature(new ComplexFeature(&features));
 
   // Available to extensions because of the content_security_policy rule.
   EXPECT_EQ(
       Feature::IS_AVAILABLE,
       feature->IsAvailableToManifest("extensionid",
                                      Manifest::TYPE_EXTENSION,
                                      Manifest::INVALID_LOCATION,
                                      Feature::UNSPECIFIED_PLATFORM,
                                      Feature::GetCurrentPlatform()).result());
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(
       Feature::INVALID_TYPE,
       feature->IsAvailableToManifest("hostedappid",
                                      Manifest::TYPE_HOSTED_APP,
                                      Manifest::INVALID_LOCATION,
                                      Feature::UNSPECIFIED_PLATFORM,
                                      Feature::GetCurrentPlatform()).result());
 }
 
 }  // namespace extensions