Index: chrome/browser/extensions/extension_keybinding_apitest.cc |
diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc |
index be19bc2a2eff4cae21bae0527b3853f5e68d4803..b477aad57f949e75aebb220fe5daeda676a0524b 100644 |
--- a/chrome/browser/extensions/extension_keybinding_apitest.cc |
+++ b/chrome/browser/extensions/extension_keybinding_apitest.cc |
@@ -4,6 +4,7 @@ |
#include "base/command_line.h" |
#include "base/macros.h" |
+#include "base/threading/thread_restrictions.h" |
#include "build/build_config.h" |
#include "chrome/app/chrome_command_ids.h" |
#include "chrome/browser/extensions/active_tab_permission_granter.h" |
@@ -558,6 +559,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, MAYBE_AllowDuplicatedMediaKeys) { |
} |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutAddedOnUpdate) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -603,6 +605,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutAddedOnUpdate) { |
} |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutChangedOnUpdate) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -651,6 +654,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutChangedOnUpdate) { |
} |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutRemovedOnUpdate) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -697,6 +701,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, ShortcutRemovedOnUpdate) { |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
ShortcutAddedOnUpdateAfterBeingAssignedByUser) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -747,6 +752,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
ShortcutChangedOnUpdateAfterBeingReassignedByUser) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -801,6 +807,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
// Test that Media keys do not overwrite previous settings. |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
MediaKeyShortcutChangedOnUpdateAfterBeingReassignedByUser) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |
@@ -854,6 +861,7 @@ IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
IN_PROC_BROWSER_TEST_F(CommandsApiTest, |
ShortcutRemovedOnUpdateAfterBeingReassignedByUser) { |
+ base::ThreadRestrictions::ScopedAllowIO allow_io; |
base::ScopedTempDir scoped_temp_dir; |
EXPECT_TRUE(scoped_temp_dir.CreateUniqueTempDir()); |
base::FilePath pem_path = test_data_dir_. |