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

Side by Side Diff: ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client.mm

Issue 1861593005: Convert //ios 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client. h" 5 #include "ios/chrome/browser/metrics/ios_chrome_metrics_services_manager_client. h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/ptr_util.h"
9 #include "components/metrics/metrics_state_manager.h" 10 #include "components/metrics/metrics_state_manager.h"
10 #include "components/prefs/pref_service.h" 11 #include "components/prefs/pref_service.h"
11 #include "components/rappor/rappor_service.h" 12 #include "components/rappor/rappor_service.h"
12 #include "components/variations/service/variations_service.h" 13 #include "components/variations/service/variations_service.h"
13 #include "ios/chrome/browser/application_context.h" 14 #include "ios/chrome/browser/application_context.h"
14 #include "ios/chrome/browser/chrome_switches.h" 15 #include "ios/chrome/browser/chrome_switches.h"
15 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h" 16 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor.h"
16 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h" 17 #include "ios/chrome/browser/metrics/ios_chrome_metrics_service_client.h"
17 #include "ios/chrome/browser/ui/browser_otr_state.h" 18 #include "ios/chrome/browser/ui/browser_otr_state.h"
18 #include "ios/chrome/browser/variations/ios_chrome_variations_service_client.h" 19 #include "ios/chrome/browser/variations/ios_chrome_variations_service_client.h"
19 #include "ios/chrome/browser/variations/ios_ui_string_overrider_factory.h" 20 #include "ios/chrome/browser/variations/ios_ui_string_overrider_factory.h"
20 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" 21 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
21 22
22 namespace { 23 namespace {
23 24
24 void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {} 25 void PostStoreMetricsClientInfo(const metrics::ClientInfo& client_info) {}
25 26
26 scoped_ptr<metrics::ClientInfo> LoadMetricsClientInfo() { 27 std::unique_ptr<metrics::ClientInfo> LoadMetricsClientInfo() {
27 return scoped_ptr<metrics::ClientInfo>(); 28 return std::unique_ptr<metrics::ClientInfo>();
28 } 29 }
29 30
30 } // namespace 31 } // namespace
31 32
32 IOSChromeMetricsServicesManagerClient::IOSChromeMetricsServicesManagerClient( 33 IOSChromeMetricsServicesManagerClient::IOSChromeMetricsServicesManagerClient(
33 PrefService* local_state) 34 PrefService* local_state)
34 : local_state_(local_state) { 35 : local_state_(local_state) {
35 DCHECK(local_state); 36 DCHECK(local_state);
36 } 37 }
37 38
38 IOSChromeMetricsServicesManagerClient:: 39 IOSChromeMetricsServicesManagerClient::
39 ~IOSChromeMetricsServicesManagerClient() { 40 ~IOSChromeMetricsServicesManagerClient() {
40 ios::GetChromeBrowserProvider()->OnMetricsServicesManagerClientDestroyed(); 41 ios::GetChromeBrowserProvider()->OnMetricsServicesManagerClientDestroyed();
41 } 42 }
42 43
43 scoped_ptr<rappor::RapporService> 44 std::unique_ptr<rappor::RapporService>
44 IOSChromeMetricsServicesManagerClient::CreateRapporService() { 45 IOSChromeMetricsServicesManagerClient::CreateRapporService() {
45 DCHECK(thread_checker_.CalledOnValidThread()); 46 DCHECK(thread_checker_.CalledOnValidThread());
46 return make_scoped_ptr(new rappor::RapporService( 47 return base::WrapUnique(new rappor::RapporService(
47 local_state_, base::Bind(&::IsOffTheRecordSessionActive))); 48 local_state_, base::Bind(&::IsOffTheRecordSessionActive)));
48 } 49 }
49 50
50 scoped_ptr<variations::VariationsService> 51 std::unique_ptr<variations::VariationsService>
51 IOSChromeMetricsServicesManagerClient::CreateVariationsService() { 52 IOSChromeMetricsServicesManagerClient::CreateVariationsService() {
52 DCHECK(thread_checker_.CalledOnValidThread()); 53 DCHECK(thread_checker_.CalledOnValidThread());
53 54
54 // NOTE: On iOS, disabling background networking is not supported, so pass in 55 // NOTE: On iOS, disabling background networking is not supported, so pass in
55 // a dummy value for the name of the switch that disables background 56 // a dummy value for the name of the switch that disables background
56 // networking. 57 // networking.
57 return variations::VariationsService::Create( 58 return variations::VariationsService::Create(
58 make_scoped_ptr(new IOSChromeVariationsServiceClient), local_state_, 59 base::WrapUnique(new IOSChromeVariationsServiceClient), local_state_,
59 GetMetricsStateManager(), "dummy-disable-background-switch", 60 GetMetricsStateManager(), "dummy-disable-background-switch",
60 ::CreateUIStringOverrider()); 61 ::CreateUIStringOverrider());
61 } 62 }
62 63
63 scoped_ptr<metrics::MetricsServiceClient> 64 std::unique_ptr<metrics::MetricsServiceClient>
64 IOSChromeMetricsServicesManagerClient::CreateMetricsServiceClient() { 65 IOSChromeMetricsServicesManagerClient::CreateMetricsServiceClient() {
65 DCHECK(thread_checker_.CalledOnValidThread()); 66 DCHECK(thread_checker_.CalledOnValidThread());
66 return IOSChromeMetricsServiceClient::Create(GetMetricsStateManager(), 67 return IOSChromeMetricsServiceClient::Create(GetMetricsStateManager(),
67 local_state_); 68 local_state_);
68 } 69 }
69 70
70 net::URLRequestContextGetter* 71 net::URLRequestContextGetter*
71 IOSChromeMetricsServicesManagerClient::GetURLRequestContext() { 72 IOSChromeMetricsServicesManagerClient::GetURLRequestContext() {
72 return GetApplicationContext()->GetSystemURLRequestContext(); 73 return GetApplicationContext()->GetSystemURLRequestContext();
73 } 74 }
(...skipping 18 matching lines...) Expand all
92 DCHECK(thread_checker_.CalledOnValidThread()); 93 DCHECK(thread_checker_.CalledOnValidThread());
93 if (!metrics_state_manager_) { 94 if (!metrics_state_manager_) {
94 metrics_state_manager_ = metrics::MetricsStateManager::Create( 95 metrics_state_manager_ = metrics::MetricsStateManager::Create(
95 local_state_, base::Bind(&IOSChromeMetricsServiceAccessor:: 96 local_state_, base::Bind(&IOSChromeMetricsServiceAccessor::
96 IsMetricsAndCrashReportingEnabled), 97 IsMetricsAndCrashReportingEnabled),
97 base::Bind(&PostStoreMetricsClientInfo), 98 base::Bind(&PostStoreMetricsClientInfo),
98 base::Bind(&LoadMetricsClientInfo)); 99 base::Bind(&LoadMetricsClientInfo));
99 } 100 }
100 return metrics_state_manager_.get(); 101 return metrics_state_manager_.get();
101 } 102 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698