Chromium Code Reviews| Index: extensions/common/features/complex_feature.cc |
| diff --git a/extensions/common/features/complex_feature.cc b/extensions/common/features/complex_feature.cc |
| index 5f041dbbc982786192cf3db7d81f36cc041dcbc5..fa5325c7afcbd62f0782a0a2354cf6ad79c25b13 100644 |
| --- a/extensions/common/features/complex_feature.cc |
| +++ b/extensions/common/features/complex_feature.cc |
| @@ -6,9 +6,10 @@ |
| namespace extensions { |
| -ComplexFeature::ComplexFeature(std::unique_ptr<FeatureList> features) { |
| - DCHECK_GT(features->size(), 0UL); |
| - features_.swap(*features); |
| +ComplexFeature::ComplexFeature(const std::vector<Feature*>& features) { |
| + DCHECK_GT(features.size(), 0UL); |
| + for (Feature* f : features) |
| + features_.push_back(std::unique_ptr<Feature>(f)); |
|
Devlin
2016/07/29 20:13:49
What if we did something in the generated code lik
scottmg
2016/07/29 20:24:53
Sorry, I'm probably missing something, but the poi
Devlin
2016/07/29 21:15:02
Ah, right, sorry. I misunderstood that the concer
|
| no_parent_ = features_[0]->no_parent(); |
| #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) |