Index: chrome/browser/ssl/ssl_browser_tests.cc |
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc |
index 8324db2e546129e19d8a067608b29eeb5940d7b1..09273e0a0e753fe3449932756fc7ebbca482a349 100644 |
--- a/chrome/browser/ssl/ssl_browser_tests.cc |
+++ b/chrome/browser/ssl/ssl_browser_tests.cc |
@@ -20,6 +20,7 @@ |
#include "base/test/histogram_tester.h" |
#include "base/test/scoped_feature_list.h" |
#include "base/test/simple_test_clock.h" |
+#include "base/threading/thread_restrictions.h" |
#include "base/threading/thread_task_runner_handle.h" |
#include "base/time/default_clock.h" |
#include "base/time/default_tick_clock.h" |
@@ -1353,7 +1354,10 @@ IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, TestWSSClientCert) { |
std::string pkcs12_data; |
base::FilePath cert_path = net::GetTestCertsDirectory().Append( |
FILE_PATH_LITERAL("websocket_client_cert.p12")); |
- EXPECT_TRUE(base::ReadFileToString(cert_path, &pkcs12_data)); |
+ { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
+ EXPECT_TRUE(base::ReadFileToString(cert_path, &pkcs12_data)); |
+ } |
EXPECT_EQ(net::OK, cert_db_->ImportFromPKCS12(public_slot.get(), pkcs12_data, |
base::string16(), true, NULL)); |
@@ -1436,6 +1440,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { |
GURL url_non_dangerous = embedded_test_server()->GetURL("/title1.html"); |
GURL url_dangerous = |
https_server_expired_.GetURL("/downloads/dangerous/dangerous.exe"); |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir downloads_directory_; |
// Need empty temp dir to avoid having Chrome ask us for a new filename |