OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_service.h" | 5 #include "chrome/browser/metrics/metrics_service.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/prefs/testing_pref_service.h" | 10 #include "base/prefs/testing_pref_service.h" |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 // ChromeOSMetricsProvider. Also remove the #include of login_state.h. | 74 // ChromeOSMetricsProvider. Also remove the #include of login_state.h. |
75 // (http://crbug.com/375776) | 75 // (http://crbug.com/375776) |
76 if (!chromeos::LoginState::IsInitialized()) | 76 if (!chromeos::LoginState::IsInitialized()) |
77 chromeos::LoginState::Initialize(); | 77 chromeos::LoginState::Initialize(); |
78 #endif // defined(OS_CHROMEOS) | 78 #endif // defined(OS_CHROMEOS) |
79 } | 79 } |
80 | 80 |
81 virtual ~MetricsServiceTest() { | 81 virtual ~MetricsServiceTest() { |
82 MetricsService::SetExecutionPhase(MetricsService::UNINITIALIZED_PHASE, | 82 MetricsService::SetExecutionPhase(MetricsService::UNINITIALIZED_PHASE, |
83 GetLocalState()); | 83 GetLocalState()); |
| 84 #if defined(OS_CHROMEOS) |
| 85 // TODO(blundell): Remove this code once MetricsService no longer creates |
| 86 // ChromeOSMetricsProvider. |
| 87 chromeos::LoginState::Shutdown(); |
| 88 #endif // defined(OS_CHROMEOS) |
84 } | 89 } |
85 | 90 |
86 metrics::MetricsStateManager* GetMetricsStateManager() { | 91 metrics::MetricsStateManager* GetMetricsStateManager() { |
87 return metrics_state_manager_.get(); | 92 return metrics_state_manager_.get(); |
88 } | 93 } |
89 | 94 |
90 PrefService* GetLocalState() { return &testing_local_state_; } | 95 PrefService* GetLocalState() { return &testing_local_state_; } |
91 | 96 |
92 // Sets metrics reporting as enabled for testing. | 97 // Sets metrics reporting as enabled for testing. |
93 void EnableMetricsReporting() { | 98 void EnableMetricsReporting() { |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
310 | 315 |
311 service.RemoveObserver(&observer1); | 316 service.RemoveObserver(&observer1); |
312 | 317 |
313 service.OpenNewLog(); | 318 service.OpenNewLog(); |
314 EXPECT_EQ(2, observer1.observed()); | 319 EXPECT_EQ(2, observer1.observed()); |
315 EXPECT_EQ(2, observer2.observed()); | 320 EXPECT_EQ(2, observer2.observed()); |
316 service.log_manager_.FinishCurrentLog(); | 321 service.log_manager_.FinishCurrentLog(); |
317 | 322 |
318 service.RemoveObserver(&observer2); | 323 service.RemoveObserver(&observer2); |
319 } | 324 } |
OLD | NEW |