| Index: extensions/common/event_filter.h
|
| diff --git a/extensions/common/event_filter.h b/extensions/common/event_filter.h
|
| index 8f6d60404200629f7d4cf9f6e837ca63737ee720..567c1d0867651121c8e051d56cb4d8f661567207 100644
|
| --- a/extensions/common/event_filter.h
|
| +++ b/extensions/common/event_filter.h
|
| @@ -28,7 +28,7 @@ class EventFilter {
|
| // Adds an event matcher that will be used in calls to MatchEvent(). Returns
|
| // the id of the matcher, or -1 if there was an error.
|
| MatcherID AddEventMatcher(const std::string& event_name,
|
| - scoped_ptr<EventMatcher> matcher);
|
| + std::unique_ptr<EventMatcher> matcher);
|
|
|
| // Retrieve the EventMatcher with the given id.
|
| EventMatcher* GetEventMatcher(MatcherID id);
|
| @@ -63,7 +63,7 @@ class EventFilter {
|
| // URLMatcherConditionSets that match the URL constraints specified by
|
| // |event_matcher|.
|
| EventMatcherEntry(
|
| - scoped_ptr<EventMatcher> event_matcher,
|
| + std::unique_ptr<EventMatcher> event_matcher,
|
| url_matcher::URLMatcher* url_matcher,
|
| const url_matcher::URLMatcherConditionSet::Vector& condition_sets);
|
| ~EventMatcherEntry();
|
| @@ -79,7 +79,7 @@ class EventFilter {
|
| }
|
|
|
| private:
|
| - scoped_ptr<EventMatcher> event_matcher_;
|
| + std::unique_ptr<EventMatcher> event_matcher_;
|
| // The id sets in url_matcher_ that this EventMatcher owns.
|
| std::vector<url_matcher::URLMatcherConditionSet::ID> condition_set_ids_;
|
| url_matcher::URLMatcher* url_matcher_;
|
|
|