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

Unified Diff: components/google/core/browser/google_url_tracker.cc

Issue 1918083002: Convert //components/[f-n]* 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: components/google/core/browser/google_url_tracker.cc
diff --git a/components/google/core/browser/google_url_tracker.cc b/components/google/core/browser/google_url_tracker.cc
index 9a21ca4934fae631c959471b8c702d3bcc4890fd..810a5bdd5806a1e9e441d3e95cf6c6686f1ad9de 100644
--- a/components/google/core/browser/google_url_tracker.cc
+++ b/components/google/core/browser/google_url_tracker.cc
@@ -29,8 +29,9 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] =
const char GoogleURLTracker::kSearchDomainCheckURL[] =
"https://www.google.com/searchdomaincheck?format=domain&type=chrome";
-GoogleURLTracker::GoogleURLTracker(scoped_ptr<GoogleURLTrackerClient> client,
- Mode mode)
+GoogleURLTracker::GoogleURLTracker(
+ std::unique_ptr<GoogleURLTrackerClient> client,
+ Mode mode)
: client_(std::move(client)),
google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage
: client_->GetPrefs()->GetString(
@@ -82,14 +83,14 @@ void GoogleURLTracker::RequestServerCheck(bool force) {
}
}
-scoped_ptr<GoogleURLTracker::Subscription> GoogleURLTracker::RegisterCallback(
- const OnGoogleURLUpdatedCallback& cb) {
+std::unique_ptr<GoogleURLTracker::Subscription>
+GoogleURLTracker::RegisterCallback(const OnGoogleURLUpdatedCallback& cb) {
return callback_list_.Add(cb);
}
void GoogleURLTracker::OnURLFetchComplete(const net::URLFetcher* source) {
// Delete the fetcher on this function's exit.
- scoped_ptr<net::URLFetcher> clean_up_fetcher(fetcher_.release());
+ std::unique_ptr<net::URLFetcher> clean_up_fetcher(std::move(fetcher_));
// Don't update the URL if the request didn't succeed.
if (!source->GetStatus().is_success() || (source->GetResponseCode() != 200)) {
« no previous file with comments | « components/google/core/browser/google_url_tracker.h ('k') | components/google/core/browser/google_url_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698