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

Unified Diff: chrome/browser/supervised_user/experimental/safe_search_url_reporter.cc

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/experimental/safe_search_url_reporter.cc
diff --git a/chrome/browser/supervised_user/experimental/safe_search_url_reporter.cc b/chrome/browser/supervised_user/experimental/safe_search_url_reporter.cc
index 0363fbd46a5a3546bbeff6f1331e7adcf63722ad..73a5355edecbfd8bec5e70d7078e5fa922e7e451 100644
--- a/chrome/browser/supervised_user/experimental/safe_search_url_reporter.cc
+++ b/chrome/browser/supervised_user/experimental/safe_search_url_reporter.cc
@@ -6,6 +6,7 @@
#include "base/callback.h"
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
@@ -39,11 +40,11 @@ struct SafeSearchURLReporter::Report {
GURL url;
SuccessCallback callback;
- scoped_ptr<OAuth2TokenService::Request> access_token_request;
+ std::unique_ptr<OAuth2TokenService::Request> access_token_request;
std::string access_token;
bool access_token_expired;
int url_fetcher_id;
- scoped_ptr<URLFetcher> url_fetcher;
+ std::unique_ptr<URLFetcher> url_fetcher;
};
SafeSearchURLReporter::Report::Report(const GURL& url,
@@ -69,12 +70,12 @@ SafeSearchURLReporter::SafeSearchURLReporter(
SafeSearchURLReporter::~SafeSearchURLReporter() {}
// static
-scoped_ptr<SafeSearchURLReporter> SafeSearchURLReporter::CreateWithProfile(
+std::unique_ptr<SafeSearchURLReporter> SafeSearchURLReporter::CreateWithProfile(
Profile* profile) {
ProfileOAuth2TokenService* token_service =
ProfileOAuth2TokenServiceFactory::GetForProfile(profile);
SigninManagerBase* signin = SigninManagerFactory::GetForProfile(profile);
- return make_scoped_ptr(new SafeSearchURLReporter(
+ return base::WrapUnique(new SafeSearchURLReporter(
token_service, signin->GetAuthenticatedAccountId(),
profile->GetRequestContext()));
}
@@ -82,7 +83,7 @@ scoped_ptr<SafeSearchURLReporter> SafeSearchURLReporter::CreateWithProfile(
void SafeSearchURLReporter::ReportUrl(const GURL& url,
const SuccessCallback& callback) {
reports_.push_back(
- make_scoped_ptr(new Report(url, callback, url_fetcher_id_)));
+ base::WrapUnique(new Report(url, callback, url_fetcher_id_)));
StartFetching(reports_.back().get());
}

Powered by Google App Engine
This is Rietveld 408576698