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

Unified Diff: chrome/browser/supervised_user/supervised_user_url_filter.h

Issue 1878143002: Convert //chrome/browser/supervised_user 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
Index: chrome/browser/supervised_user/supervised_user_url_filter.h
diff --git a/chrome/browser/supervised_user/supervised_user_url_filter.h b/chrome/browser/supervised_user/supervised_user_url_filter.h
index b532e5ecdf7d768f00d519684710c5cbe4377129..7e5019338325143913604965efa4e9f0fac79dc0 100644
--- a/chrome/browser/supervised_user/supervised_user_url_filter.h
+++ b/chrome/browser/supervised_user/supervised_user_url_filter.h
@@ -6,13 +6,13 @@
#define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_URL_FILTER_H_
#include <map>
+#include <memory>
#include <string>
#include <vector>
#include "base/callback_forward.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/threading/non_thread_safe.h"
#include "base/values.h"
@@ -176,7 +176,7 @@ class SupervisedUserURLFilter
friend class base::RefCountedThreadSafe<SupervisedUserURLFilter>;
~SupervisedUserURLFilter();
- void SetContents(scoped_ptr<Contents> url_matcher);
+ void SetContents(std::unique_ptr<Contents> url_matcher);
FilteringBehavior GetFilteringBehaviorForURL(
const GURL& url,
@@ -192,7 +192,7 @@ class SupervisedUserURLFilter
mutable base::ObserverList<Observer> observers_;
FilteringBehavior default_behavior_;
- scoped_ptr<Contents> contents_;
+ std::unique_ptr<Contents> contents_;
// Maps from a URL to whether it is manually allowed (true) or blocked
// (false).
@@ -205,7 +205,7 @@ class SupervisedUserURLFilter
// Not owned.
const SupervisedUserBlacklist* blacklist_;
- scoped_ptr<SupervisedUserAsyncURLChecker> async_url_checker_;
+ std::unique_ptr<SupervisedUserAsyncURLChecker> async_url_checker_;
scoped_refptr<base::TaskRunner> blocking_task_runner_;

Powered by Google App Engine
This is Rietveld 408576698