Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: components/url_matcher/regex_set_matcher.h

Issue 1917673002: Convert //components/[u-z]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/url_formatter/url_formatter.cc ('k') | components/url_matcher/url_matcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/url_matcher/regex_set_matcher.h
diff --git a/components/url_matcher/regex_set_matcher.h b/components/url_matcher/regex_set_matcher.h
index e4eb1dc052f1e0bb14be7371f8992a4d7abc02da..0f9e52b26f5dcff8304b9e0975e7e1406b313fe7 100644
--- a/components/url_matcher/regex_set_matcher.h
+++ b/components/url_matcher/regex_set_matcher.h
@@ -6,11 +6,11 @@
#define COMPONENTS_URL_MATCHER_REGEX_SET_MATCHER_H_
#include <map>
+#include <memory>
#include <set>
#include <string>
#include <vector>
-#include "base/memory/scoped_ptr.h"
#include "components/url_matcher/string_pattern.h"
#include "components/url_matcher/substring_set_matcher.h"
#include "components/url_matcher/url_matcher_export.h"
@@ -70,8 +70,8 @@ class URL_MATCHER_EXPORT RegexSetMatcher {
// to regex StringPattern::IDs.
RE2IDMap re2_id_map_;
- scoped_ptr<re2::FilteredRE2> filtered_re2_;
- scoped_ptr<SubstringSetMatcher> substring_matcher_;
+ std::unique_ptr<re2::FilteredRE2> filtered_re2_;
+ std::unique_ptr<SubstringSetMatcher> substring_matcher_;
// The substring patterns from FilteredRE2, which are used in
// |substring_matcher_| but whose lifetime is managed here.
« no previous file with comments | « components/url_formatter/url_formatter.cc ('k') | components/url_matcher/url_matcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698