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

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

Issue 607313002: Fix the condition when disabling CertLoaderTest and NetworkCertMigratorTest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « chromeos/cert_loader_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 10 matching lines...) Expand all
21 #include "net/base/crypto_module.h" 21 #include "net/base/crypto_module.h"
22 #include "net/base/net_errors.h" 22 #include "net/base/net_errors.h"
23 #include "net/base/test_data_directory.h" 23 #include "net/base/test_data_directory.h"
24 #include "net/cert/nss_cert_database_chromeos.h" 24 #include "net/cert/nss_cert_database_chromeos.h"
25 #include "net/cert/x509_certificate.h" 25 #include "net/cert/x509_certificate.h"
26 #include "net/test/cert_test_util.h" 26 #include "net/test/cert_test_util.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 #include "third_party/cros_system_api/dbus/service_constants.h" 28 #include "third_party/cros_system_api/dbus/service_constants.h"
29 29
30 // http://crbug.com/418369 30 // http://crbug.com/418369
31 #ifndef NDEBUG 31 #ifdef NDEBUG
32 32
33 namespace chromeos { 33 namespace chromeos {
34 34
35 namespace { 35 namespace {
36 36
37 const char* kWifiStub = "wifi_stub"; 37 const char* kWifiStub = "wifi_stub";
38 const char* kEthernetEapStub = "ethernet_eap_stub"; 38 const char* kEthernetEapStub = "ethernet_eap_stub";
39 const char* kVPNStub = "vpn_stub"; 39 const char* kVPNStub = "vpn_stub";
40 const char* kNSSNickname = "nss_nickname"; 40 const char* kNSSNickname = "nss_nickname";
41 const char* kFakePEM = "pem"; 41 const char* kFakePEM = "pem";
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 std::string pkcs11_id; 503 std::string pkcs11_id;
504 std::string slot_id; 504 std::string slot_id;
505 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id); 505 GetVpnCertId(false /* IPsec */, &slot_id, &pkcs11_id);
506 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id); 506 EXPECT_EQ(test_client_cert_pkcs11_id_, pkcs11_id);
507 EXPECT_EQ(test_client_cert_slot_id_, slot_id); 507 EXPECT_EQ(test_client_cert_slot_id_, slot_id);
508 } 508 }
509 509
510 } // namespace chromeos 510 } // namespace chromeos
511 511
512 #endif 512 #endif
OLDNEW
« no previous file with comments | « chromeos/cert_loader_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698