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

Unified Diff: ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h

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/metrics/ios_chrome_metrics_service_client.h
diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
index f2a9f8d3f9d64219215e503565e134a9fae3f5bf..f0014a37532f004f69205efed2b958f6c0f5305e 100644
--- a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
+++ b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h
@@ -7,11 +7,11 @@
#include <stdint.h>
+#include <memory>
#include <string>
#include "base/callback.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "components/metrics/metrics_service_client.h"
@@ -44,7 +44,7 @@ class IOSChromeMetricsServiceClient
~IOSChromeMetricsServiceClient() override;
// Factory function.
- static scoped_ptr<IOSChromeMetricsServiceClient> Create(
+ static std::unique_ptr<IOSChromeMetricsServiceClient> Create(
metrics::MetricsStateManager* state_manager,
PrefService* local_state);
@@ -65,7 +65,7 @@ class IOSChromeMetricsServiceClient
void InitializeSystemProfileMetrics(
const base::Closure& done_callback) override;
void CollectFinalMetricsForLog(const base::Closure& done_callback) override;
- scoped_ptr<metrics::MetricsLogUploader> CreateUploader(
+ std::unique_ptr<metrics::MetricsLogUploader> CreateUploader(
const base::Callback<void(int)>& on_upload_complete) override;
base::TimeDelta GetStandardUploadInterval() override;
base::string16 GetRegistryBackupKey() override;
@@ -120,7 +120,7 @@ class IOSChromeMetricsServiceClient
metrics::MetricsStateManager* metrics_state_manager_;
// The MetricsService that |this| is a client of.
- scoped_ptr<metrics::MetricsService> metrics_service_;
+ std::unique_ptr<metrics::MetricsService> metrics_service_;
// The IOSChromeStabilityMetricsProvider instance that was registered with
// MetricsService. Has the same lifetime as |metrics_service_|.
@@ -144,12 +144,12 @@ class IOSChromeMetricsServiceClient
const base::TimeTicks start_time_;
// Subscription for receiving callbacks that a tab was parented.
- scoped_ptr<base::CallbackList<void(web::WebState*)>::Subscription>
+ std::unique_ptr<base::CallbackList<void(web::WebState*)>::Subscription>
tab_parented_subscription_;
// Subscription for receiving callbacks that a URL was opened from the
// omnibox.
- scoped_ptr<base::CallbackList<void(OmniboxLog*)>::Subscription>
+ std::unique_ptr<base::CallbackList<void(OmniboxLog*)>::Subscription>
omnibox_url_opened_subscription_;
// Whether this client has already uploaded profiler data during this session.
« no previous file with comments | « ios/chrome/browser/memory/memory_metrics.cc ('k') | ios/chrome/browser/metrics/ios_chrome_metrics_service_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698