OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/chromeos/customization_document.h" | 5 #include "chrome/browser/chromeos/customization_document.h" |
6 | 6 |
7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
8 #include "base/prefs/testing_pref_service.h" | 8 #include "base/prefs/testing_pref_service.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
228 &mock_statistics_provider_); | 228 &mock_statistics_provider_); |
229 | 229 |
230 DBusThreadManager::InitializeWithStub(); | 230 DBusThreadManager::InitializeWithStub(); |
231 NetworkHandler::Initialize(); | 231 NetworkHandler::Initialize(); |
232 | 232 |
233 NetworkPortalDetector::InitializeForTesting(&network_portal_detector_); | 233 NetworkPortalDetector::InitializeForTesting(&network_portal_detector_); |
234 NetworkPortalDetector::CaptivePortalState online_state; | 234 NetworkPortalDetector::CaptivePortalState online_state; |
235 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; | 235 online_state.status = NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE; |
236 online_state.response_code = 204; | 236 online_state.response_code = 204; |
237 network_portal_detector_.SetDefaultNetworkPathForTesting( | 237 network_portal_detector_.SetDefaultNetworkPathForTesting( |
238 kStubEthernetServicePath, | |
238 kStubEthernetServicePath); | 239 kStubEthernetServicePath); |
stevenjb
2014/06/06 21:43:49
/* guid */ (here and elsewhere)
tbarzic
2014/06/06 22:00:41
Done.
| |
239 network_portal_detector_.SetDetectionResultsForTesting( | 240 network_portal_detector_.SetDetectionResultsForTesting( |
240 kStubEthernetServicePath, online_state); | 241 kStubEthernetServicePath, online_state); |
241 | 242 |
242 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); | 243 TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_); |
243 ServicesCustomizationDocument::RegisterPrefs(local_state_.registry()); | 244 ServicesCustomizationDocument::RegisterPrefs(local_state_.registry()); |
244 } | 245 } |
245 | 246 |
246 virtual void TearDown() OVERRIDE { | 247 virtual void TearDown() OVERRIDE { |
247 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); | 248 TestingBrowserProcess::GetGlobal()->SetLocalState(NULL); |
248 NetworkHandler::Shutdown(); | 249 NetworkHandler::Shutdown(); |
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
469 EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _)) | 470 EXPECT_CALL(visitor, OnExternalExtensionUpdateUrlFound(_, _, _, _, _, _)) |
470 .Times(0); | 471 .Times(0); |
471 EXPECT_CALL(visitor, OnExternalProviderReady(_)) | 472 EXPECT_CALL(visitor, OnExternalProviderReady(_)) |
472 .Times(1); | 473 .Times(1); |
473 | 474 |
474 RunUntilIdle(); | 475 RunUntilIdle(); |
475 EXPECT_TRUE(doc->IsReady()); | 476 EXPECT_TRUE(doc->IsReady()); |
476 } | 477 } |
477 | 478 |
478 } // namespace chromeos | 479 } // namespace chromeos |
OLD | NEW |