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

Unified Diff: net/test/cert_test_util.cc

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)
Patch Set: ready for review Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/shell/test/shell_test.cc ('k') | sql/test/test_helpers.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/cert_test_util.cc
diff --git a/net/test/cert_test_util.cc b/net/test/cert_test_util.cc
index 8da3aecf2d4060ae27ba647a7f2e8e6dcf43ba60..2c22d84f29e79b0bf62991e03c535b66bca26ef5 100644
--- a/net/test/cert_test_util.cc
+++ b/net/test/cert_test_util.cc
@@ -6,6 +6,7 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
+#include "base/threading/thread_restrictions.h"
#include "net/cert/ev_root_ca_metadata.h"
#include "net/cert/x509_certificate.h"
#include "net/test/test_data_directory.h"
@@ -63,6 +64,7 @@ scoped_refptr<X509Certificate> CreateCertificateChainFromFile(
scoped_refptr<X509Certificate> ImportCertFromFile(
const base::FilePath& certs_dir,
const std::string& cert_file) {
+ base::ThreadRestrictions::ScopedAllowIO allow_io;
base::FilePath cert_path = certs_dir.AppendASCII(cert_file);
std::string cert_data;
if (!base::ReadFileToString(cert_path, &cert_data))
« no previous file with comments | « extensions/shell/test/shell_test.cc ('k') | sql/test/test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698