Reland of Further reduction of feature_compiler.py generated code

extensions/common/features/simple_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/simple_feature.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 863 matching lines @@
   std::unique_ptr<ComplexFeature> complex_feature;
   {
     std::unique_ptr<SimpleFeature> feature1(CreateFeature<SimpleFeature>());
     feature1->channel_.reset(
         new version_info::Channel(version_info::Channel::BETA));
     feature1->extension_types_.push_back(Manifest::TYPE_EXTENSION);
     std::unique_ptr<SimpleFeature> feature2(CreateFeature<SimpleFeature>());
     feature2->channel_.reset(
         new version_info::Channel(version_info::Channel::BETA));
     feature2->extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
-    std::unique_ptr<ComplexFeature::FeatureList> list(
-        new ComplexFeature::FeatureList());
-    list->push_back(std::move(feature1));
-    list->push_back(std::move(feature2));
-    complex_feature.reset(new ComplexFeature(std::move(list)));
+    std::vector<Feature*> list;
+    list.push_back(feature1.release());
+    list.push_back(feature2.release());
+    complex_feature.reset(new ComplexFeature(&list));
   }
 
   Feature* feature = static_cast<Feature*>(complex_feature.get());
   // Make sure both rules are applied correctly.
   {
     ScopedCurrentChannel current_channel(version_info::Channel::BETA);
     EXPECT_EQ(
         Feature::IS_AVAILABLE,
         feature->IsAvailableToManifest("1",
                                        Manifest::TYPE_EXTENSION,
@@ skipping 30 matching lines @@
     // Rule: "extension", channel trunk.
     std::unique_ptr<SimpleFeature> feature1(CreateFeature<SimpleFeature>());
     feature1->channel_.reset(
         new version_info::Channel(version_info::Channel::UNKNOWN));
     feature1->extension_types_.push_back(Manifest::TYPE_EXTENSION);
     std::unique_ptr<SimpleFeature> feature2(CreateFeature<SimpleFeature>());
     // Rule: "legacy_packaged_app", channel stable.
     feature2->channel_.reset(
         new version_info::Channel(version_info::Channel::STABLE));
     feature2->extension_types_.push_back(Manifest::TYPE_LEGACY_PACKAGED_APP);
-    std::unique_ptr<ComplexFeature::FeatureList> list(
-        new ComplexFeature::FeatureList());
-    list->push_back(std::move(feature1));
-    list->push_back(std::move(feature2));
-    complex_feature.reset(new ComplexFeature(std::move(list)));
+    std::vector<Feature*> list;
+    list.push_back(feature1.release());
+    list.push_back(feature2.release());
+    complex_feature.reset(new ComplexFeature(&list));
   }
 
   Feature* feature = static_cast<Feature*>(complex_feature.get());
   {
     ScopedCurrentChannel current_channel(version_info::Channel::UNKNOWN);
     EXPECT_EQ(Feature::IS_AVAILABLE,
               feature
                   ->IsAvailableToManifest("1", Manifest::TYPE_EXTENSION,
                                           Manifest::INVALID_LOCATION,
                                           Feature::UNSPECIFIED_PLATFORM)
@@ skipping 13 matching lines @@
     EXPECT_NE(Feature::IS_AVAILABLE,
               feature
                   ->IsAvailableToManifest("1", Manifest::TYPE_EXTENSION,
                                           Manifest::INVALID_LOCATION,
                                           Feature::UNSPECIFIED_PLATFORM)
                   .result());
   }
 }
 
 }  // namespace extensions