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 "chromeos/network/network_cert_migrator.h" | 5 #include "chromeos/network/network_cert_migrator.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <pk11pub.h> | 8 #include <pk11pub.h> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
| 13 #include "base/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 14 #include "base/run_loop.h" |
14 #include "base/strings/string_number_conversions.h" | 15 #include "base/strings/string_number_conversions.h" |
15 #include "base/test/scoped_task_scheduler.h" | 16 #include "base/test/scoped_task_scheduler.h" |
16 #include "chromeos/cert_loader.h" | 17 #include "chromeos/cert_loader.h" |
17 #include "chromeos/dbus/dbus_thread_manager.h" | 18 #include "chromeos/dbus/dbus_thread_manager.h" |
18 #include "chromeos/dbus/shill_profile_client.h" | 19 #include "chromeos/dbus/shill_profile_client.h" |
19 #include "chromeos/dbus/shill_service_client.h" | 20 #include "chromeos/dbus/shill_service_client.h" |
20 #include "chromeos/network/network_state_handler.h" | 21 #include "chromeos/network/network_state_handler.h" |
21 #include "crypto/scoped_nss_types.h" | 22 #include "crypto/scoped_nss_types.h" |
22 #include "crypto/scoped_test_nss_db.h" | 23 #include "crypto/scoped_test_nss_db.h" |
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
333 base::RunLoop().RunUntilIdle(); | 334 base::RunLoop().RunUntilIdle(); |
334 | 335 |
335 std::string pkcs11_id; | 336 std::string pkcs11_id; |
336 std::string slot_id; | 337 std::string slot_id; |
337 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id); | 338 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id); |
338 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id); | 339 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id); |
339 EXPECT_EQ(test_client_cert_slot_id_, slot_id); | 340 EXPECT_EQ(test_client_cert_slot_id_, slot_id); |
340 } | 341 } |
341 | 342 |
342 } // namespace chromeos | 343 } // namespace chromeos |
OLD | NEW |