Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(598)

Side by Side Diff: chromeos/network/network_cert_migrator_unittest.cc

Issue 2090463002: Move net/base/test_data_directory.[cc,h] to net/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "chromeos/cert_loader.h" 15 #include "chromeos/cert_loader.h"
16 #include "chromeos/dbus/dbus_thread_manager.h" 16 #include "chromeos/dbus/dbus_thread_manager.h"
17 #include "chromeos/dbus/shill_profile_client.h" 17 #include "chromeos/dbus/shill_profile_client.h"
18 #include "chromeos/dbus/shill_service_client.h" 18 #include "chromeos/dbus/shill_service_client.h"
19 #include "chromeos/network/network_state_handler.h" 19 #include "chromeos/network/network_state_handler.h"
20 #include "crypto/scoped_nss_types.h" 20 #include "crypto/scoped_nss_types.h"
21 #include "crypto/scoped_test_nss_db.h" 21 #include "crypto/scoped_test_nss_db.h"
22 #include "net/base/test_data_directory.h"
23 #include "net/cert/nss_cert_database_chromeos.h" 22 #include "net/cert/nss_cert_database_chromeos.h"
24 #include "net/cert/x509_certificate.h" 23 #include "net/cert/x509_certificate.h"
25 #include "net/test/cert_test_util.h" 24 #include "net/test/cert_test_util.h"
25 #include "net/test/test_data_directory.h"
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 #include "third_party/cros_system_api/dbus/service_constants.h" 27 #include "third_party/cros_system_api/dbus/service_constants.h"
28 28
29 namespace chromeos { 29 namespace chromeos {
30 30
31 namespace { 31 namespace {
32 32
33 const char* kWifiStub = "wifi_stub"; 33 const char* kWifiStub = "wifi_stub";
34 const char* kEthernetEapStub = "ethernet_eap_stub"; 34 const char* kEthernetEapStub = "ethernet_eap_stub";
35 const char* kVPNStub = "vpn_stub"; 35 const char* kVPNStub = "vpn_stub";
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 base::RunLoop().RunUntilIdle(); 331 base::RunLoop().RunUntilIdle();
332 332
333 std::string pkcs11_id; 333 std::string pkcs11_id;
334 std::string slot_id; 334 std::string slot_id;
335 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id); 335 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);
336 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id); 336 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);
337 EXPECT_EQ(test_client_cert_slot_id_, slot_id); 337 EXPECT_EQ(test_client_cert_slot_id_, slot_id);
338 } 338 }
339 339
340 } // namespace chromeos 340 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/client_cert_resolver_unittest.cc ('k') | chromeos/network/network_connection_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698