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

Unified Diff: ios/chrome/browser/google/google_url_tracker_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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: ios/chrome/browser/google/google_url_tracker_factory.cc
diff --git a/ios/chrome/browser/google/google_url_tracker_factory.cc b/ios/chrome/browser/google/google_url_tracker_factory.cc
index bdee6bdf2696c834f9c703507928a01a99a4cf46..434c9209b0b09b29972022d77293c6b64a0ab91b 100644
--- a/ios/chrome/browser/google/google_url_tracker_factory.cc
+++ b/ios/chrome/browser/google/google_url_tracker_factory.cc
@@ -4,6 +4,7 @@
#include "ios/chrome/browser/google/google_url_tracker_factory.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "components/google/core/browser/google_pref_names.h"
#include "components/google/core/browser/google_url_tracker.h"
@@ -36,7 +37,7 @@ GoogleURLTrackerFactory::GoogleURLTrackerFactory()
GoogleURLTrackerFactory::~GoogleURLTrackerFactory() {
}
-scoped_ptr<KeyedService> GoogleURLTrackerFactory::BuildServiceInstanceFor(
+std::unique_ptr<KeyedService> GoogleURLTrackerFactory::BuildServiceInstanceFor(
web::BrowserState* context) const {
ios::ChromeBrowserState* browser_state =
ios::ChromeBrowserState::FromBrowserState(context);
@@ -46,8 +47,8 @@ scoped_ptr<KeyedService> GoogleURLTrackerFactory::BuildServiceInstanceFor(
browser_state->GetOriginalChromeBrowserState()->GetPrefs()->ClearPref(
prefs::kLastPromptedGoogleURL);
- return make_scoped_ptr(new GoogleURLTracker(
- make_scoped_ptr(new GoogleURLTrackerClientImpl(browser_state)),
+ return base::WrapUnique(new GoogleURLTracker(
+ base::WrapUnique(new GoogleURLTrackerClientImpl(browser_state)),
GoogleURLTracker::NORMAL_MODE));
}
« no previous file with comments | « ios/chrome/browser/google/google_url_tracker_factory.h ('k') | ios/chrome/browser/history/history_client_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698