OLD | NEW |
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() = default; | 40 ~IOSChromeMetricsServicesManagerClient() = default; |
40 | 41 |
41 scoped_ptr<rappor::RapporService> | 42 std::unique_ptr<rappor::RapporService> |
42 IOSChromeMetricsServicesManagerClient::CreateRapporService() { | 43 IOSChromeMetricsServicesManagerClient::CreateRapporService() { |
43 DCHECK(thread_checker_.CalledOnValidThread()); | 44 DCHECK(thread_checker_.CalledOnValidThread()); |
44 return make_scoped_ptr(new rappor::RapporService( | 45 return base::WrapUnique(new rappor::RapporService( |
45 local_state_, base::Bind(&::IsOffTheRecordSessionActive))); | 46 local_state_, base::Bind(&::IsOffTheRecordSessionActive))); |
46 } | 47 } |
47 | 48 |
48 scoped_ptr<variations::VariationsService> | 49 std::unique_ptr<variations::VariationsService> |
49 IOSChromeMetricsServicesManagerClient::CreateVariationsService() { | 50 IOSChromeMetricsServicesManagerClient::CreateVariationsService() { |
50 DCHECK(thread_checker_.CalledOnValidThread()); | 51 DCHECK(thread_checker_.CalledOnValidThread()); |
51 | 52 |
52 // NOTE: On iOS, disabling background networking is not supported, so pass in | 53 // NOTE: On iOS, disabling background networking is not supported, so pass in |
53 // a dummy value for the name of the switch that disables background | 54 // a dummy value for the name of the switch that disables background |
54 // networking. | 55 // networking. |
55 return variations::VariationsService::Create( | 56 return variations::VariationsService::Create( |
56 make_scoped_ptr(new IOSChromeVariationsServiceClient), local_state_, | 57 base::WrapUnique(new IOSChromeVariationsServiceClient), local_state_, |
57 GetMetricsStateManager(), "dummy-disable-background-switch", | 58 GetMetricsStateManager(), "dummy-disable-background-switch", |
58 ::CreateUIStringOverrider()); | 59 ::CreateUIStringOverrider()); |
59 } | 60 } |
60 | 61 |
61 scoped_ptr<metrics::MetricsServiceClient> | 62 std::unique_ptr<metrics::MetricsServiceClient> |
62 IOSChromeMetricsServicesManagerClient::CreateMetricsServiceClient() { | 63 IOSChromeMetricsServicesManagerClient::CreateMetricsServiceClient() { |
63 DCHECK(thread_checker_.CalledOnValidThread()); | 64 DCHECK(thread_checker_.CalledOnValidThread()); |
64 return IOSChromeMetricsServiceClient::Create(GetMetricsStateManager(), | 65 return IOSChromeMetricsServiceClient::Create(GetMetricsStateManager(), |
65 local_state_); | 66 local_state_); |
66 } | 67 } |
67 | 68 |
68 net::URLRequestContextGetter* | 69 net::URLRequestContextGetter* |
69 IOSChromeMetricsServicesManagerClient::GetURLRequestContext() { | 70 IOSChromeMetricsServicesManagerClient::GetURLRequestContext() { |
70 return GetApplicationContext()->GetSystemURLRequestContext(); | 71 return GetApplicationContext()->GetSystemURLRequestContext(); |
71 } | 72 } |
(...skipping 18 matching lines...) Expand all Loading... |
90 DCHECK(thread_checker_.CalledOnValidThread()); | 91 DCHECK(thread_checker_.CalledOnValidThread()); |
91 if (!metrics_state_manager_) { | 92 if (!metrics_state_manager_) { |
92 metrics_state_manager_ = metrics::MetricsStateManager::Create( | 93 metrics_state_manager_ = metrics::MetricsStateManager::Create( |
93 local_state_, base::Bind(&IOSChromeMetricsServiceAccessor:: | 94 local_state_, base::Bind(&IOSChromeMetricsServiceAccessor:: |
94 IsMetricsAndCrashReportingEnabled), | 95 IsMetricsAndCrashReportingEnabled), |
95 base::Bind(&PostStoreMetricsClientInfo), | 96 base::Bind(&PostStoreMetricsClientInfo), |
96 base::Bind(&LoadMetricsClientInfo)); | 97 base::Bind(&LoadMetricsClientInfo)); |
97 } | 98 } |
98 return metrics_state_manager_.get(); | 99 return metrics_state_manager_.get(); |
99 } | 100 } |
OLD | NEW |