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

Side by Side Diff: chromeos/cert_loader_unittest.cc

Issue 555313002: Cleanup: Use base/files/file_util.h instead of base/file_util.h in ash/, athena/, and chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/accelerometer/accelerometer_reader.cc ('k') | chromeos/chromeos_paths.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/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"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 certs[0], net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL)); 298 certs[0], net::CA_CERT, net::NSSCertDatabase::TRUSTED_SSL));
299 299
300 // Cert trust change should trigger certificate reload in cert_loader_. 300 // Cert trust change should trigger certificate reload in cert_loader_.
301 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount()); 301 ASSERT_EQ(0U, GetAndResetCertificatesLoadedEventsCount());
302 base::RunLoop().RunUntilIdle(); 302 base::RunLoop().RunUntilIdle();
303 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount()); 303 EXPECT_EQ(1U, GetAndResetCertificatesLoadedEventsCount());
304 } 304 }
305 305
306 } // namespace 306 } // namespace
307 } // namespace chromeos 307 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/accelerometer/accelerometer_reader.cc ('k') | chromeos/chromeos_paths.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698