diff options
| author | vaibhav1.a <vaibhav1.a@samsung.com> | 2015-05-27 00:08:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-27 07:09:40 +0000 |
| commit | 3755726c1be7e5bb14d6f71e1018803e61d907a0 (patch) | |
| tree | efeba860b62426e9180c9ddb226850bbab92bc22 /extensions/common/features | |
| parent | bd86fad4f17693e82d01ad279f5af58825782cd5 (diff) | |
| download | chromium_src-3755726c1be7e5bb14d6f71e1018803e61d907a0.zip chromium_src-3755726c1be7e5bb14d6f71e1018803e61d907a0.tar.gz chromium_src-3755726c1be7e5bb14d6f71e1018803e61d907a0.tar.bz2 | |
Subsituting pattern ScopedVector push_back.(ptr.release()) with push_back(ptr.Pass()) in extensions/common/features/
BUG=
Review URL: https://codereview.chromium.org/1152183002
Cr-Commit-Position: refs/heads/master@{#331543}
Diffstat (limited to 'extensions/common/features')
| -rw-r--r-- | extensions/common/features/base_feature_provider.cc | 2 | ||||
| -rw-r--r-- | extensions/common/features/complex_feature_unittest.cc | 8 | ||||
| -rw-r--r-- | extensions/common/features/simple_feature.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/extensions/common/features/base_feature_provider.cc b/extensions/common/features/base_feature_provider.cc index 40807f41..9d24d84 100644 --- a/extensions/common/features/base_feature_provider.cc +++ b/extensions/common/features/base_feature_provider.cc @@ -128,7 +128,7 @@ BaseFeatureProvider::BaseFeatureProvider(const base::DictionaryValue& root, feature.get())) continue; - features->push_back(feature.release()); + features->push_back(feature.Pass()); } linked_ptr<ComplexFeature> feature(new ComplexFeature(features.Pass())); diff --git a/extensions/common/features/complex_feature_unittest.cc b/extensions/common/features/complex_feature_unittest.cc index 0f8a9ea..54355aa 100644 --- a/extensions/common/features/complex_feature_unittest.cc +++ b/extensions/common/features/complex_feature_unittest.cc @@ -27,7 +27,7 @@ TEST(ComplexFeatureTest, MultipleRulesWhitelist) { .Set("extension_types", ListBuilder() .Append("extension")).Build()); simple_feature->Parse(rule.get()); - features->push_back(simple_feature.release()); + features->push_back(simple_feature.Pass()); // Rule: "legacy_packaged_app", whitelist "bar". simple_feature.reset(new SimpleFeature); @@ -36,7 +36,7 @@ TEST(ComplexFeatureTest, MultipleRulesWhitelist) { .Set("extension_types", ListBuilder() .Append("legacy_packaged_app")).Build(); simple_feature->Parse(rule.get()); - features->push_back(simple_feature.release()); + features->push_back(simple_feature.Pass()); scoped_ptr<ComplexFeature> feature(new ComplexFeature(features.Pass())); @@ -88,7 +88,7 @@ TEST(ComplexFeatureTest, Dependencies) { ListBuilder().Append("manifest:content_security_policy")) .Build(); simple_feature->Parse(rule.get()); - features->push_back(simple_feature.release()); + features->push_back(simple_feature.Pass()); // Rule which depends on an platform-app-only feature (serial). simple_feature.reset(new SimpleFeature); @@ -96,7 +96,7 @@ TEST(ComplexFeatureTest, Dependencies) { .Set("dependencies", ListBuilder().Append("permission:serial")) .Build(); simple_feature->Parse(rule.get()); - features->push_back(simple_feature.release()); + features->push_back(simple_feature.Pass()); scoped_ptr<ComplexFeature> feature(new ComplexFeature(features.Pass())); diff --git a/extensions/common/features/simple_feature.cc b/extensions/common/features/simple_feature.cc index 3322fac..e7e6844 100644 --- a/extensions/common/features/simple_feature.cc +++ b/extensions/common/features/simple_feature.cc @@ -297,7 +297,7 @@ bool SimpleFeature::HasDependencies() const { } void SimpleFeature::AddFilter(scoped_ptr<SimpleFeatureFilter> filter) { - filters_.push_back(filter.release()); + filters_.push_back(filter.Pass()); } std::string SimpleFeature::Parse(const base::DictionaryValue* dictionary) { |