| Index: extensions/browser/api/declarative_webrequest/webrequest_condition.cc
|
| diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
|
| index ef72ea4496c47d76242aefe460eb0e74cf89897d..7e41f1228ece01b3c3ee8573b9fc0b4f6f0fc621 100644
|
| --- a/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
|
| +++ b/extensions/browser/api/declarative_webrequest/webrequest_condition.cc
|
| @@ -125,7 +125,7 @@ void WebRequestCondition::GetURLMatcherConditionSets(
|
| }
|
|
|
| // static
|
| -scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
|
| +std::unique_ptr<WebRequestCondition> WebRequestCondition::Create(
|
| const Extension* extension,
|
| URLMatcherConditionFactory* url_matcher_condition_factory,
|
| const base::Value& condition,
|
| @@ -133,18 +133,18 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
|
| const base::DictionaryValue* condition_dict = NULL;
|
| if (!condition.GetAsDictionary(&condition_dict)) {
|
| *error = kExpectedDictionary;
|
| - return scoped_ptr<WebRequestCondition>();
|
| + return std::unique_ptr<WebRequestCondition>();
|
| }
|
|
|
| // Verify that we are dealing with a Condition whose type we understand.
|
| std::string instance_type;
|
| if (!condition_dict->GetString(keys::kInstanceTypeKey, &instance_type)) {
|
| *error = kConditionWithoutInstanceType;
|
| - return scoped_ptr<WebRequestCondition>();
|
| + return std::unique_ptr<WebRequestCondition>();
|
| }
|
| if (instance_type != keys::kRequestMatcherType) {
|
| *error = kExpectedOtherConditionType;
|
| - return scoped_ptr<WebRequestCondition>();
|
| + return std::unique_ptr<WebRequestCondition>();
|
| }
|
|
|
| WebRequestConditionAttributes attributes;
|
| @@ -185,17 +185,16 @@ scoped_ptr<WebRequestCondition> WebRequestCondition::Create(
|
| attributes.push_back(attribute);
|
| }
|
| if (!error->empty())
|
| - return scoped_ptr<WebRequestCondition>();
|
| + return std::unique_ptr<WebRequestCondition>();
|
| }
|
|
|
| - scoped_ptr<WebRequestCondition> result(
|
| - new WebRequestCondition(url_matcher_condition_set,
|
| - first_party_url_matcher_condition_set,
|
| - attributes));
|
| + std::unique_ptr<WebRequestCondition> result(new WebRequestCondition(
|
| + url_matcher_condition_set, first_party_url_matcher_condition_set,
|
| + attributes));
|
|
|
| if (!result->stages()) {
|
| *error = kConditionCannotBeFulfilled;
|
| - return scoped_ptr<WebRequestCondition>();
|
| + return std::unique_ptr<WebRequestCondition>();
|
| }
|
|
|
| return result;
|
|
|