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/policy/device_status_collector.h" | 5 #include "chrome/browser/policy/device_status_collector.h" |
6 | 6 |
7 #include "base/environment.h" | 7 #include "base/environment.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 device_settings_provider_ = | 153 device_settings_provider_ = |
154 cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo); | 154 cros_settings_->GetProvider(chromeos::kReportDeviceVersionInfo); |
155 EXPECT_TRUE(device_settings_provider_ != NULL); | 155 EXPECT_TRUE(device_settings_provider_ != NULL); |
156 EXPECT_TRUE( | 156 EXPECT_TRUE( |
157 cros_settings_->RemoveSettingsProvider(device_settings_provider_)); | 157 cros_settings_->RemoveSettingsProvider(device_settings_provider_)); |
158 cros_settings_->AddSettingsProvider(&stub_settings_provider_); | 158 cros_settings_->AddSettingsProvider(&stub_settings_provider_); |
159 | 159 |
160 RestartStatusCollector(); | 160 RestartStatusCollector(); |
161 } | 161 } |
162 | 162 |
163 ~DeviceStatusCollectorTest() { | 163 virtual ~DeviceStatusCollectorTest() { |
164 // Finish pending tasks. | 164 // Finish pending tasks. |
165 content::BrowserThread::GetBlockingPool()->FlushForTesting(); | 165 content::BrowserThread::GetBlockingPool()->FlushForTesting(); |
166 message_loop_.RunUntilIdle(); | 166 message_loop_.RunUntilIdle(); |
167 | 167 |
168 // Restore the real DeviceSettingsProvider. | 168 // Restore the real DeviceSettingsProvider. |
169 EXPECT_TRUE( | 169 EXPECT_TRUE( |
170 cros_settings_->RemoveSettingsProvider(&stub_settings_provider_)); | 170 cros_settings_->RemoveSettingsProvider(&stub_settings_provider_)); |
171 cros_settings_->AddSettingsProvider(device_settings_provider_); | 171 cros_settings_->AddSettingsProvider(device_settings_provider_); |
172 } | 172 } |
173 | 173 |
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 // Check that after enabling location reporting again, an error is reported | 564 // Check that after enabling location reporting again, an error is reported |
565 // if no valid fix is available. | 565 // if no valid fix is available. |
566 SetMockPositionToReturnNext(invalid_fix); | 566 SetMockPositionToReturnNext(invalid_fix); |
567 cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true); | 567 cros_settings_->SetBoolean(chromeos::kReportDeviceLocation, true); |
568 // Allow the new pref to propagate to the status collector. | 568 // Allow the new pref to propagate to the status collector. |
569 message_loop_.RunUntilIdle(); | 569 message_loop_.RunUntilIdle(); |
570 CheckThatALocationErrorIsReported(); | 570 CheckThatALocationErrorIsReported(); |
571 } | 571 } |
572 | 572 |
573 } // namespace policy | 573 } // namespace policy |
OLD | NEW |