OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/callback.h" | 6 #include "base/callback.h" |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
10 #include "chrome/browser/chromeos/login/helper.h" | 10 #include "chrome/browser/chromeos/login/helper.h" |
11 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" | 11 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h" |
12 #include "chrome/browser/extensions/extension_apitest.h" | 12 #include "chrome/browser/extensions/extension_apitest.h" |
13 #include "chrome/test/base/ui_test_utils.h" | |
14 #include "chromeos/chromeos_switches.h" | 13 #include "chromeos/chromeos_switches.h" |
15 #include "chromeos/dbus/cryptohome_client.h" | 14 #include "chromeos/dbus/cryptohome_client.h" |
16 #include "chromeos/dbus/dbus_thread_manager.h" | 15 #include "chromeos/dbus/dbus_thread_manager.h" |
17 #include "chromeos/dbus/shill_device_client.h" | 16 #include "chromeos/dbus/shill_device_client.h" |
18 #include "chromeos/dbus/shill_ipconfig_client.h" | 17 #include "chromeos/dbus/shill_ipconfig_client.h" |
19 #include "chromeos/dbus/shill_manager_client.h" | 18 #include "chromeos/dbus/shill_manager_client.h" |
20 #include "chromeos/dbus/shill_profile_client.h" | 19 #include "chromeos/dbus/shill_profile_client.h" |
21 #include "chromeos/dbus/shill_service_client.h" | 20 #include "chromeos/dbus/shill_service_client.h" |
22 #include "chromeos/login/user_names.h" | 21 #include "chromeos/login/user_names.h" |
23 #include "chromeos/network/onc/onc_utils.h" | 22 #include "chromeos/network/onc/onc_utils.h" |
24 #include "chromeos/network/portal_detector/network_portal_detector.h" | 23 #include "chromeos/network/portal_detector/network_portal_detector.h" |
25 #include "components/onc/onc_constants.h" | 24 #include "components/onc/onc_constants.h" |
26 #include "components/policy/core/browser/browser_policy_connector.h" | 25 #include "components/policy/core/browser/browser_policy_connector.h" |
27 #include "components/policy/core/common/external_data_fetcher.h" | 26 #include "components/policy/core/common/external_data_fetcher.h" |
28 #include "components/policy/core/common/mock_configuration_policy_provider.h" | 27 #include "components/policy/core/common/mock_configuration_policy_provider.h" |
29 #include "components/policy/core/common/policy_map.h" | 28 #include "components/policy/core/common/policy_map.h" |
30 #include "components/policy/core/common/policy_types.h" | 29 #include "components/policy/core/common/policy_types.h" |
31 #include "components/user_manager/user.h" | 30 #include "components/user_manager/user.h" |
32 #include "components/user_manager/user_manager.h" | 31 #include "components/user_manager/user_manager.h" |
33 #include "content/public/browser/notification_observer.h" | 32 #include "content/public/browser/notification_observer.h" |
34 #include "content/public/browser/notification_registrar.h" | 33 #include "content/public/browser/notification_registrar.h" |
35 #include "content/public/browser/notification_service.h" | 34 #include "content/public/browser/notification_service.h" |
36 #include "content/public/browser/notification_source.h" | 35 #include "content/public/browser/notification_source.h" |
| 36 #include "content/public/test/test_utils.h" |
37 #include "extensions/browser/notification_types.h" | 37 #include "extensions/browser/notification_types.h" |
38 #include "extensions/common/switches.h" | 38 #include "extensions/common/switches.h" |
39 #include "policy/policy_constants.h" | 39 #include "policy/policy_constants.h" |
40 #include "testing/gmock/include/gmock/gmock.h" | 40 #include "testing/gmock/include/gmock/gmock.h" |
41 #include "third_party/cros_system_api/dbus/service_constants.h" | 41 #include "third_party/cros_system_api/dbus/service_constants.h" |
42 | 42 |
43 // This tests the Chrome OS implementaiton of the networkingPrivate API. | 43 // This tests the Chrome OS implementaiton of the networkingPrivate API. |
44 // Note: the expectations in test/data/extensions/api_test/networking/test.js | 44 // Note: the expectations in test/data/extensions/api_test/networking/test.js |
45 // are shared between this and the Win/Mac tests. TODO(stevenjb): Develop | 45 // are shared between this and the Win/Mac tests. TODO(stevenjb): Develop |
46 // a mechanism to specify the test expecations from here to eliminate that | 46 // a mechanism to specify the test expecations from here to eliminate that |
(...skipping 479 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
526 detector()->SetDetectionResultsForTesting("wifi_guid", state); | 526 detector()->SetDetectionResultsForTesting("wifi_guid", state); |
527 | 527 |
528 TestListener listener( | 528 TestListener listener( |
529 "notifyPortalDetectorObservers", | 529 "notifyPortalDetectorObservers", |
530 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, | 530 base::Bind(&NetworkPortalDetectorTestImpl::NotifyObserversForTesting, |
531 base::Unretained(detector()))); | 531 base::Unretained(detector()))); |
532 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; | 532 EXPECT_TRUE(RunNetworkingSubtest("captivePortalNotification")) << message_; |
533 } | 533 } |
534 | 534 |
535 } // namespace | 535 } // namespace |
OLD | NEW |