| Index: extensions/common/matcher/url_matcher_factory.cc
|
| diff --git a/extensions/common/matcher/url_matcher_factory.cc b/extensions/common/matcher/url_matcher_factory.cc
|
| index eb1548ca897ce8dcfc284fd7a9195e86ef12baa1..6eec2e6ab12e54eabc6345e835433c27d2ac7d5d 100644
|
| --- a/extensions/common/matcher/url_matcher_factory.cc
|
| +++ b/extensions/common/matcher/url_matcher_factory.cc
|
| @@ -224,14 +224,14 @@ scoped_ptr<URLMatcherSchemeFilter> URLMatcherFactory::CreateURLMatcherScheme(
|
| if (!helpers::GetAsStringVector(value, &schemas)) {
|
| *error = ErrorUtils::FormatErrorMessage(kVectorOfStringsExpected,
|
| keys::kSchemesKey);
|
| - return scoped_ptr<URLMatcherSchemeFilter>(NULL);
|
| + return scoped_ptr<URLMatcherSchemeFilter>();
|
| }
|
| for (std::vector<std::string>::const_iterator it = schemas.begin();
|
| it != schemas.end(); ++it) {
|
| if (ContainsUpperCase(*it)) {
|
| *error = ErrorUtils::FormatErrorMessage(kLowerCaseExpected,
|
| "Scheme");
|
| - return scoped_ptr<URLMatcherSchemeFilter>(NULL);
|
| + return scoped_ptr<URLMatcherSchemeFilter>();
|
| }
|
| }
|
| return scoped_ptr<URLMatcherSchemeFilter>(
|
| @@ -246,7 +246,7 @@ scoped_ptr<URLMatcherPortFilter> URLMatcherFactory::CreateURLMatcherPorts(
|
| const base::ListValue* value_list = NULL;
|
| if (!value->GetAsList(&value_list)) {
|
| *error = kInvalidPortRanges;
|
| - return scoped_ptr<URLMatcherPortFilter>(NULL);
|
| + return scoped_ptr<URLMatcherPortFilter>();
|
| }
|
|
|
| for (ListValue::const_iterator i = value_list->begin();
|
| @@ -262,12 +262,12 @@ scoped_ptr<URLMatcherPortFilter> URLMatcherFactory::CreateURLMatcherPorts(
|
| !range->GetInteger(0, &from) ||
|
| !range->GetInteger(1, &to)) {
|
| *error = kInvalidPortRanges;
|
| - return scoped_ptr<URLMatcherPortFilter>(NULL);
|
| + return scoped_ptr<URLMatcherPortFilter>();
|
| }
|
| ranges.push_back(URLMatcherPortFilter::CreateRange(from, to));
|
| } else {
|
| *error = kInvalidPortRanges;
|
| - return scoped_ptr<URLMatcherPortFilter>(NULL);
|
| + return scoped_ptr<URLMatcherPortFilter>();
|
| }
|
| }
|
|
|
|
|