| Index: ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h
|
| diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h
|
| index 314c00b20ba3a05c69358510713aeddad9eb0cd9..38d939f52290b8e13df73df5083e98ff1cd04210 100644
|
| --- a/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h
|
| +++ b/ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef IOS_CHROME_BROWSER_METRICS_IOS_CHROME_METRICS_SERVICES_MANAGER_CLIENT_H_
|
| #define IOS_CHROME_BROWSER_METRICS_IOS_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 "components/metrics_services_manager/metrics_services_manager_client.h"
|
|
|
| @@ -26,9 +27,10 @@ class IOSChromeMetricsServicesManagerClient
|
|
|
| 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 IOSChromeMetricsServicesManagerClient
|
| 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_;
|
|
|