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

Unified Diff: chrome/browser/metrics/chrome_metrics_services_manager_client.h

Issue 1886913002: Convert //chrome/browser/metrics 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/metrics/chrome_metrics_services_manager_client.h
diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.h b/chrome/browser/metrics/chrome_metrics_services_manager_client.h
index 318660659935f0a789acdb859639c5bbbbd5393e..d2b8ecaeb5fe568c04c20af5fef6ceda4985c1dd 100644
--- a/chrome/browser/metrics/chrome_metrics_services_manager_client.h
+++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.h
@@ -5,8 +5,9 @@
#ifndef CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_
#define CHROME_BROWSER_METRICS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "components/metrics_services_manager/metrics_services_manager_client.h"
@@ -26,9 +27,10 @@ class ChromeMetricsServicesManagerClient
private:
// metrics_services_manager::MetricsServicesManagerClient:
- scoped_ptr<rappor::RapporService> CreateRapporService() override;
- scoped_ptr<variations::VariationsService> CreateVariationsService() override;
- scoped_ptr<metrics::MetricsServiceClient> CreateMetricsServiceClient()
+ std::unique_ptr<rappor::RapporService> CreateRapporService() override;
+ std::unique_ptr<variations::VariationsService> CreateVariationsService()
+ override;
+ std::unique_ptr<metrics::MetricsServiceClient> CreateMetricsServiceClient()
override;
net::URLRequestContextGetter* GetURLRequestContext() override;
bool IsSafeBrowsingEnabled(const base::Closure& on_update_callback) override;
@@ -40,7 +42,7 @@ class ChromeMetricsServicesManagerClient
metrics::MetricsStateManager* GetMetricsStateManager();
// MetricsStateManager which is passed as a parameter to service constructors.
- scoped_ptr<metrics::MetricsStateManager> metrics_state_manager_;
+ std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_;
// Ensures that all functions are called from the same thread.
base::ThreadChecker thread_checker_;
@@ -49,7 +51,7 @@ class ChromeMetricsServicesManagerClient
PrefService* local_state_;
// Subscription to SafeBrowsing service state changes.
- scoped_ptr<safe_browsing::SafeBrowsingService::StateSubscription>
+ std::unique_ptr<safe_browsing::SafeBrowsingService::StateSubscription>
sb_state_subscription_;
DISALLOW_COPY_AND_ASSIGN(ChromeMetricsServicesManagerClient);

Powered by Google App Engine
This is Rietveld 408576698