| Index: extensions/common/features/complex_feature.cc
|
| diff --git a/extensions/common/features/complex_feature.cc b/extensions/common/features/complex_feature.cc
|
| index 674b4eea741c4c3dd283f2dfe4e586c34303c9ec..9a330c1ff64166e83d4c752d8086c518d9549253 100644
|
| --- a/extensions/common/features/complex_feature.cc
|
| +++ b/extensions/common/features/complex_feature.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| namespace extensions {
|
|
|
| -ComplexFeature::ComplexFeature(scoped_ptr<FeatureList> features) {
|
| +ComplexFeature::ComplexFeature(std::unique_ptr<FeatureList> features) {
|
| DCHECK_GT(features->size(), 0UL);
|
| features_.swap(*features);
|
| no_parent_ = features_[0]->no_parent();
|
|
|