Reland of Further reduction of feature_compiler.py generated code

extensions/common/features/simple_feature_unittest.cc

Index: extensions/common/features/simple_feature_unittest.cc
diff --git a/extensions/common/features/simple_feature_unittest.cc b/extensions/common/features/simple_feature_unittest.cc
index 2f40b81083befc0f0c6353259130194f1fa5b1da..5ad4f78b466bde4cff4d59b4b7cc3e72a1fd2027 100644
--- a/extensions/common/features/simple_feature_unittest.cc
+++ b/extensions/common/features/simple_feature_unittest.cc
@@ -881,11 +881,10 @@
     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());
@@ -936,11 +935,10 @@
     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());