| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 28 #include "crypto/nss_util_internal.h" | 28 #include "crypto/nss_util_internal.h" |
| 29 #include "crypto/scoped_test_nss_chromeos_user.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 // http://crbug.com/418369 |
| 39 #ifdef NDEBUG |
| 40 |
| 38 namespace { | 41 namespace { |
| 39 | 42 |
| 40 const char* kSuccessResult = "success"; | 43 const char* kSuccessResult = "success"; |
| 41 | 44 |
| 42 void ConfigureCallback(const dbus::ObjectPath& result) { | 45 void ConfigureCallback(const dbus::ObjectPath& result) { |
| 43 } | 46 } |
| 44 | 47 |
| 45 void ConfigureErrorCallback(const std::string& error_name, | 48 void ConfigureErrorCallback(const std::string& error_name, |
| 46 const std::string& error_message) { | 49 const std::string& error_message) { |
| 47 } | 50 } |
| (...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 true); | 507 true); |
| 505 | 508 |
| 506 SetupPolicy(kPolicy, global_config, false /* load as device policy */); | 509 SetupPolicy(kPolicy, global_config, false /* load as device policy */); |
| 507 EXPECT_EQ(shill::kStateIdle, | 510 EXPECT_EQ(shill::kStateIdle, |
| 508 GetServiceStringProperty("wifi0", shill::kStateProperty)); | 511 GetServiceStringProperty("wifi0", shill::kStateProperty)); |
| 509 EXPECT_EQ(shill::kStateOnline, | 512 EXPECT_EQ(shill::kStateOnline, |
| 510 GetServiceStringProperty("wifi1", shill::kStateProperty)); | 513 GetServiceStringProperty("wifi1", shill::kStateProperty)); |
| 511 } | 514 } |
| 512 | 515 |
| 513 } // namespace chromeos | 516 } // namespace chromeos |
| 517 |
| 518 #endif |
| OLD | NEW |