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

Unified Diff: chrome/browser/google/google_update_settings_posix.cc

Issue 1878313003: Convert //chrome/installer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert decompress.cc in mini_installer. 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 | « no previous file | chrome/installer/setup/install.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google/google_update_settings_posix.cc
diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc
index a03d9acc01630e5008f54b549c03b34106f95f24..059672e939a0f31b00b125bb9123fa5ba697267d 100644
--- a/chrome/browser/google/google_update_settings_posix.cc
+++ b/chrome/browser/google/google_update_settings_posix.cc
@@ -94,12 +94,13 @@ bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
// static
// TODO(gab): Implement storing/loading for all ClientInfo fields on POSIX.
-scoped_ptr<metrics::ClientInfo> GoogleUpdateSettings::LoadMetricsClientInfo() {
- scoped_ptr<metrics::ClientInfo> client_info(new metrics::ClientInfo);
+std::unique_ptr<metrics::ClientInfo>
+GoogleUpdateSettings::LoadMetricsClientInfo() {
+ std::unique_ptr<metrics::ClientInfo> client_info(new metrics::ClientInfo);
base::AutoLock lock(g_posix_client_id_lock.Get());
if (g_posix_client_id.Get().empty())
- return scoped_ptr<metrics::ClientInfo>();
+ return nullptr;
client_info->client_id = g_posix_client_id.Get();
return client_info;
« no previous file with comments | « no previous file | chrome/installer/setup/install.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698