Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi...

chrome/browser/extensions/extension_keybinding_apitest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 534 matching lines @@
   // Activate the Media Stop key.
   ASSERT_TRUE(ui_test_utils::SendKeyPressSync(
       browser(), ui::VKEY_MEDIA_STOP, false, false, false, false));
 
   // We should get two success result.
   ASSERT_TRUE(catcher.GetNextResult());
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1_unassigned = PackExtensionWithOptions(
       test_data_dir_.AppendASCII("keybinding")
           .AppendASCII("update")
           .AppendASCII("v1_unassigned"),
       scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
       base::FilePath());
@@ skipping 25 matching lines @@
   // Verify it has a command of Alt+Shift+F.
   accelerator = command_service->FindCommandByName(
       kId, manifest_values::kBrowserActionCommandEvent).accelerator();
   EXPECT_EQ(ui::VKEY_F, accelerator.key_code());
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 =
       PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
                                    .AppendASCII("update")
                                    .AppendASCII("v1"),
                                scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
                                pem_path, base::FilePath());
@@ skipping 28 matching lines @@
   // Verify it has a command of Alt+Shift+H.
   accelerator = command_service->FindCommandByName(
       kId, manifest_values::kBrowserActionCommandEvent).accelerator();
   EXPECT_EQ(ui::VKEY_H, accelerator.key_code());
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 =
       PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
                                    .AppendASCII("update")
                                    .AppendASCII("v1"),
                                scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
                                pem_path, base::FilePath());
@@ skipping 26 matching lines @@
               NULL);
 
   // Verify the keybinding gets set to nothing.
   accelerator = command_service->FindCommandByName(
       kId, manifest_values::kBrowserActionCommandEvent).accelerator();
   EXPECT_EQ(ui::VKEY_UNKNOWN, accelerator.key_code());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1_unassigned = PackExtensionWithOptions(
       test_data_dir_.AppendASCII("keybinding")
           .AppendASCII("update")
           .AppendASCII("v1_unassigned"),
       scoped_temp_dir.GetPath().AppendASCII("v1_unassigned.crx"), pem_path,
       base::FilePath());
@@ skipping 30 matching lines @@
   accelerator = command_service->FindCommandByName(
       kId, manifest_values::kBrowserActionCommandEvent).accelerator();
   EXPECT_EQ(ui::VKEY_G, accelerator.key_code());
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 =
       PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
                                    .AppendASCII("update")
                                    .AppendASCII("v1"),
                                scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
                                pem_path, base::FilePath());
@@ skipping 34 matching lines @@
       kId, manifest_values::kBrowserActionCommandEvent).accelerator();
   EXPECT_EQ(ui::VKEY_G, accelerator.key_code());
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 // 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 = PackExtensionWithOptions(
       test_data_dir_.AppendASCII("keybinding")
           .AppendASCII("update")
           .AppendASCII("mk_v1"),
       scoped_temp_dir.GetPath().AppendASCII("mk_v1.crx"), pem_path,
       base::FilePath());
@@ skipping 33 matching lines @@
   accelerator = command_service->FindCommandByName(
       kId, kMediaKeyTestCommand).accelerator();
   EXPECT_EQ(ui::VKEY_G, accelerator.key_code());
   EXPECT_FALSE(accelerator.IsCtrlDown());
   EXPECT_TRUE(accelerator.IsShiftDown());
   EXPECT_TRUE(accelerator.IsAltDown());
 }
 
 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_.
       AppendASCII("keybinding").AppendASCII("keybinding.pem");
   base::FilePath path_v1 =
       PackExtensionWithOptions(test_data_dir_.AppendASCII("keybinding")
                                    .AppendASCII("update")
                                    .AppendASCII("v1"),
                                scoped_temp_dir.GetPath().AppendASCII("v1.crx"),
                                pem_path, base::FilePath());
@@ skipping 97 matching lines @@
 
   extensions::ExtensionSystem::Get(browser()->profile())
       ->extension_service()
       ->component_loader()
       ->Remove("pkplfbidichfdicaijlchgnapepdginl");
 
   ASSERT_TRUE(RunComponentExtensionTest("keybinding/component")) << message_;
 }
 
 }  // namespace extensions