| Index: components/url_matcher/url_matcher.cc
|
| diff --git a/components/url_matcher/url_matcher.cc b/components/url_matcher/url_matcher.cc
|
| index f12632236c3abe06820686a8fd9b4a1c2669e3a7..91cd15b61b2a4ba5faaa8cc19ce7a0556994bb39 100644
|
| --- a/components/url_matcher/url_matcher.cc
|
| +++ b/components/url_matcher/url_matcher.cc
|
| @@ -742,8 +742,8 @@ URLMatcherConditionSet::URLMatcherConditionSet(
|
| URLMatcherConditionSet::URLMatcherConditionSet(
|
| ID id,
|
| const Conditions& conditions,
|
| - scoped_ptr<URLMatcherSchemeFilter> scheme_filter,
|
| - scoped_ptr<URLMatcherPortFilter> port_filter)
|
| + std::unique_ptr<URLMatcherSchemeFilter> scheme_filter,
|
| + std::unique_ptr<URLMatcherPortFilter> port_filter)
|
| : id_(id),
|
| conditions_(conditions),
|
| scheme_filter_(std::move(scheme_filter)),
|
| @@ -753,8 +753,8 @@ URLMatcherConditionSet::URLMatcherConditionSet(
|
| ID id,
|
| const Conditions& conditions,
|
| const QueryConditions& query_conditions,
|
| - scoped_ptr<URLMatcherSchemeFilter> scheme_filter,
|
| - scoped_ptr<URLMatcherPortFilter> port_filter)
|
| + std::unique_ptr<URLMatcherSchemeFilter> scheme_filter,
|
| + std::unique_ptr<URLMatcherPortFilter> port_filter)
|
| : id_(id),
|
| conditions_(conditions),
|
| query_conditions_(query_conditions),
|
|
|