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

Side by Side Diff: chrome/browser/metrics/metrics_services_manager.cc

Issue 290343005: Pass MetricsServiceClient into MetricsService, and create a simple stubbed TestMetricsServiceClient… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/metrics/metrics_services_manager.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/metrics/metrics_services_manager.h" 5 #include "chrome/browser/metrics/metrics_services_manager.h"
6 6
7 #include "chrome/browser/metrics/metrics_service.h" 7 #include "chrome/browser/metrics/metrics_service.h"
8 #include "chrome/browser/metrics/metrics_state_manager.h" 8 #include "chrome/browser/metrics/metrics_state_manager.h"
9 #include "chrome/browser/metrics/variations/variations_service.h" 9 #include "chrome/browser/metrics/variations/variations_service.h"
10 #include "components/rappor/rappor_service.h" 10 #include "components/rappor/rappor_service.h"
11 11
12 MetricsServicesManager::MetricsServicesManager(PrefService* local_state) 12 MetricsServicesManager::MetricsServicesManager(PrefService* local_state)
13 : local_state_(local_state) { 13 : local_state_(local_state) {
14 DCHECK(local_state); 14 DCHECK(local_state);
15 } 15 }
16 16
17 MetricsServicesManager::~MetricsServicesManager() { 17 MetricsServicesManager::~MetricsServicesManager() {
18 } 18 }
19 19
20 MetricsService* MetricsServicesManager::GetMetricsService() { 20 MetricsService* MetricsServicesManager::GetMetricsService() {
21 DCHECK(thread_checker_.CalledOnValidThread()); 21 DCHECK(thread_checker_.CalledOnValidThread());
22 if (!metrics_service_) 22 if (!metrics_service_) {
23 metrics_service_.reset(new MetricsService(GetMetricsStateManager())); 23 metrics_service_.reset(
24 new MetricsService(GetMetricsStateManager(), &metrics_service_client_));
25 }
24 return metrics_service_.get(); 26 return metrics_service_.get();
25 } 27 }
26 28
27 rappor::RapporService* MetricsServicesManager::GetRapporService() { 29 rappor::RapporService* MetricsServicesManager::GetRapporService() {
28 DCHECK(thread_checker_.CalledOnValidThread()); 30 DCHECK(thread_checker_.CalledOnValidThread());
29 if (!rappor_service_) 31 if (!rappor_service_)
30 rappor_service_.reset(new rappor::RapporService); 32 rappor_service_.reset(new rappor::RapporService);
31 return rappor_service_.get(); 33 return rappor_service_.get();
32 } 34 }
33 35
34 chrome_variations::VariationsService* 36 chrome_variations::VariationsService*
35 MetricsServicesManager::GetVariationsService() { 37 MetricsServicesManager::GetVariationsService() {
36 DCHECK(thread_checker_.CalledOnValidThread()); 38 DCHECK(thread_checker_.CalledOnValidThread());
37 if (!variations_service_) { 39 if (!variations_service_) {
38 variations_service_ = 40 variations_service_ =
39 chrome_variations::VariationsService::Create(local_state_, 41 chrome_variations::VariationsService::Create(local_state_,
40 GetMetricsStateManager()); 42 GetMetricsStateManager());
41 } 43 }
42 return variations_service_.get(); 44 return variations_service_.get();
43 } 45 }
44 46
45 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() { 47 metrics::MetricsStateManager* MetricsServicesManager::GetMetricsStateManager() {
46 DCHECK(thread_checker_.CalledOnValidThread()); 48 DCHECK(thread_checker_.CalledOnValidThread());
47 if (!metrics_state_manager_) 49 if (!metrics_state_manager_)
48 metrics_state_manager_ = metrics::MetricsStateManager::Create(local_state_); 50 metrics_state_manager_ = metrics::MetricsStateManager::Create(local_state_);
49 return metrics_state_manager_.get(); 51 return metrics_state_manager_.get();
50 } 52 }
OLDNEW
« no previous file with comments | « chrome/browser/metrics/metrics_services_manager.h ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698