| 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 "chromeos/network/network_connection_handler.h" | 5 #include "chromeos/network/network_connection_handler.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
| 13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
| 14 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 15 #include "chromeos/cert_loader.h" | 15 #include "chromeos/cert_loader.h" |
| 16 #include "chromeos/dbus/fake_dbus_thread_manager.h" | 16 #include "chromeos/dbus/fake_dbus_thread_manager.h" |
| 17 #include "chromeos/dbus/shill_device_client.h" | 17 #include "chromeos/dbus/shill_device_client.h" |
| 18 #include "chromeos/dbus/shill_manager_client.h" | 18 #include "chromeos/dbus/shill_manager_client.h" |
| 19 #include "chromeos/dbus/shill_profile_client.h" | 19 #include "chromeos/dbus/shill_profile_client.h" |
| 20 #include "chromeos/dbus/shill_service_client.h" | 20 #include "chromeos/dbus/shill_service_client.h" |
| 21 #include "chromeos/network/managed_network_configuration_handler_impl.h" | 21 #include "chromeos/network/managed_network_configuration_handler_impl.h" |
| 22 #include "chromeos/network/network_configuration_handler.h" | 22 #include "chromeos/network/network_configuration_handler.h" |
| 23 #include "chromeos/network/network_profile_handler.h" | 23 #include "chromeos/network/network_profile_handler.h" |
| 24 #include "chromeos/network/network_state_handler.h" | 24 #include "chromeos/network/network_state_handler.h" |
| 25 #include "chromeos/network/onc/onc_utils.h" | 25 #include "chromeos/network/onc/onc_utils.h" |
| 26 #include "chromeos/tpm_token_loader.h" | 26 #include "chromeos/tpm_token_loader.h" |
| 27 #include "components/onc/onc_constants.h" | 27 #include "components/onc/onc_constants.h" |
| 28 #include "crypto/nss_util.h" | |
| 29 #include "crypto/nss_util_internal.h" | 28 #include "crypto/nss_util_internal.h" |
| 29 #include "crypto/scoped_test_nss_chromeos_user.h" |
| 30 #include "net/base/net_errors.h" | 30 #include "net/base/net_errors.h" |
| 31 #include "net/base/test_data_directory.h" | 31 #include "net/base/test_data_directory.h" |
| 32 #include "net/cert/nss_cert_database_chromeos.h" | 32 #include "net/cert/nss_cert_database_chromeos.h" |
| 33 #include "net/cert/x509_certificate.h" | 33 #include "net/cert/x509_certificate.h" |
| 34 #include "net/test/cert_test_util.h" | 34 #include "net/test/cert_test_util.h" |
| 35 #include "testing/gtest/include/gtest/gtest.h" | 35 #include "testing/gtest/include/gtest/gtest.h" |
| 36 #include "third_party/cros_system_api/dbus/service_constants.h" | 36 #include "third_party/cros_system_api/dbus/service_constants.h" |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| 39 | 39 |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 true); | 492 true); |
| 493 | 493 |
| 494 SetupPolicy(kPolicy, global_config, false /* load as device policy */); | 494 SetupPolicy(kPolicy, global_config, false /* load as device policy */); |
| 495 EXPECT_EQ(shill::kStateIdle, | 495 EXPECT_EQ(shill::kStateIdle, |
| 496 GetServiceStringProperty("wifi0", shill::kStateProperty)); | 496 GetServiceStringProperty("wifi0", shill::kStateProperty)); |
| 497 EXPECT_EQ(shill::kStateOnline, | 497 EXPECT_EQ(shill::kStateOnline, |
| 498 GetServiceStringProperty("wifi1", shill::kStateProperty)); | 498 GetServiceStringProperty("wifi1", shill::kStateProperty)); |
| 499 } | 499 } |
| 500 | 500 |
| 501 } // namespace chromeos | 501 } // namespace chromeos |
| OLD | NEW |