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

Side by Side Diff: chromeos/cert_loader_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 | « no previous file | chromeos/network/network_cert_migrator_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/cert_loader.h" 5 #include "chromeos/cert_loader.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/run_loop.h" 11 #include "base/run_loop.h"
12 #include "crypto/nss_util_internal.h" 12 #include "crypto/nss_util_internal.h"
13 #include "crypto/scoped_nss_types.h" 13 #include "crypto/scoped_nss_types.h"
14 #include "crypto/scoped_test_nss_chromeos_user.h" 14 #include "crypto/scoped_test_nss_chromeos_user.h"
15 #include "net/base/net_errors.h" 15 #include "net/base/net_errors.h"
16 #include "net/base/test_data_directory.h" 16 #include "net/base/test_data_directory.h"
17 #include "net/cert/nss_cert_database_chromeos.h" 17 #include "net/cert/nss_cert_database_chromeos.h"
18 #include "net/cert/x509_certificate.h" 18 #include "net/cert/x509_certificate.h"
19 #include "net/test/cert_test_util.h" 19 #include "net/test/cert_test_util.h"
20 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
21 21
22 // http://crbug.com/418369 22 // http://crbug.com/418369
23 #ifndef NDEBUG 23 #ifdef NDEBUG
24 24
25 namespace chromeos { 25 namespace chromeos {
26 namespace { 26 namespace {
27 27
28 bool IsCertInCertificateList(const net::X509Certificate* cert, 28 bool IsCertInCertificateList(const net::X509Certificate* cert,
29 const net::CertificateList& cert_list) { 29 const net::CertificateList& cert_list) {
30 for (net::CertificateList::const_iterator it = cert_list.begin(); 30 for (net::CertificateList::const_iterator it = cert_list.begin();
31 it != cert_list.end(); 31 it != cert_list.end();
32 ++it) { 32 ++it) {
33 if (net::X509Certificate::IsSameOSCert((*it)->os_cert_handle(), 33 if (net::X509Certificate::IsSameOSCert((*it)->os_cert_handle(),
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount()); 314 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
315 base::RunLoop().RunUntilIdle(); 315 base::RunLoop().RunUntilIdle();
316 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount()); 316 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
317 } 317 }
318 318
319 } // namespace 319 } // namespace
320 } // namespace chromeos 320 } // namespace chromeos
321 321
322 #endif 322 #endif
323 323
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/network_cert_migrator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698