| commit | e6fb2d0077fdaea8393d527caf80f513803dbd06 | [log] [tgz] |
|---|---|---|
| author | Francois Doray <[email protected]> | Wed Oct 18 21:29:13 2017 |
| committer | Commit Bot <[email protected]> | Wed Oct 18 21:29:13 2017 |
| tree | 14b44b9ab1d2237ee60dce541e3bf1f07ca0e939 | |
| parent | 9167e1c4eb3a1b6d094399e35efe427185303428 [diff] [blame] |
Replace ScopedAllowIO with ScopedAllowBlockingForTesting in tests. s/ThreadRestrictions::ScopedAllowIO allow_io;/ ScopedAllowBlockingForTesting allow_blocking;/ in files that have the word "test" in their path. ThreadRestrictions::ScopedAllowIO instances that are not named |allow_io| are not changed by this CL. [email protected] Bug: 766678 Change-Id: Ie809d1b39d50c1669cd36399cdfe5657cf072c21 Reviewed-on: https://chromium-review.googlesource.com/718983 Reviewed-by: François Doray <[email protected]> Reviewed-by: Gabriel Charette <[email protected]> Commit-Queue: François Doray <[email protected]> Cr-Commit-Position: refs/heads/master@{#509880}
diff --git a/net/test/cert_test_util.cc b/net/test/cert_test_util.cc index e3150954..0295d7b8 100644 --- a/net/test/cert_test_util.cc +++ b/net/test/cert_test_util.cc
@@ -64,7 +64,7 @@ scoped_refptr<X509Certificate> ImportCertFromFile( const base::FilePath& certs_dir, const std::string& cert_file) { - base::ThreadRestrictions::ScopedAllowIO allow_io; + base::ScopedAllowBlockingForTesting allow_blocking; base::FilePath cert_path = certs_dir.AppendASCII(cert_file); std::string cert_data; if (!base::ReadFileToString(cert_path, &cert_data))