Reland of Further reduction of feature_compiler.py generated code

extensions/common/features/json_feature_provider.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/json_feature_provider.h"
 
 #include <stddef.h>
 
 #include <stack>
 #include <utility>
@@ skipping 98 matching lines @@
       if (parse_error)
         continue;
 
       AddFeature(iter.key(), std::move(feature));
     } else if (iter.value().GetType() == base::Value::TYPE_LIST) {
       // This is a complex feature.
       const base::ListValue* list =
           static_cast<const base::ListValue*>(&iter.value());
       CHECK_GT(list->GetSize(), 0UL);
 
-      std::unique_ptr<ComplexFeature::FeatureList> features(
-          new ComplexFeature::FeatureList());
+      std::vector<Feature*> features;
 
       // Parse and add all SimpleFeatures from the list.
       for (const auto& entry : *list) {
         base::DictionaryValue* dict;
         if (!entry->GetAsDictionary(&dict)) {
           LOG(ERROR) << iter.key() << ": Feature rules must be dictionaries.";
           continue;
         }
 
         std::unique_ptr<SimpleFeature> feature((*factory_)());
         if (!ParseFeature(dict, iter.key(), feature.get()))
           continue;
 
-        features->push_back(std::move(feature));
+        features.push_back(feature.release());
       }
 
-      std::unique_ptr<ComplexFeature> feature(
-          new ComplexFeature(std::move(features)));
+      std::unique_ptr<ComplexFeature> feature(new ComplexFeature(&features));
       feature->set_name(iter.key());
 
-      AddFeature(iter.key(), std::move(feature));
+      AddFeature(iter.key(), feature.release());
     } else {
       LOG(ERROR) << iter.key() << ": Feature description must be dictionary or"
                  << " list of dictionaries.";
     }
   }
 }
 
 JSONFeatureProvider::~JSONFeatureProvider() {}
 
 }  // namespace extensions