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

chrome/browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm

 // Copyright 2013 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 "chrome/browser/apps/app_shim/app_shim_host_manager_mac.h"
 
 #include <unistd.h>
 
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/path_service.h"
+#include "base/threading/thread_restrictions.h"
 #include "chrome/browser/apps/app_shim/app_shim_handler_mac.h"
 #include "chrome/browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/mac/app_mode_common.h"
 #include "chrome/common/mac/app_shim_messages.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/version_info/version_info.h"
@@ skipping 35 matching lines @@
   base::Thread::Options io_thread_options;
   io_thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
   io_thread_.StartWithOptions(io_thread_options);
 
   base::FilePath user_data_dir;
   CHECK(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   base::FilePath symlink_path =
       user_data_dir.Append(app_mode::kAppShimSocketSymlinkName);
 
   base::FilePath socket_path;
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   CHECK(base::ReadSymbolicLink(symlink_path, &socket_path));
   app_mode::VerifySocketPermissions(socket_path);
 
   channel_ = IPC::ChannelProxy::Create(
       IPC::ChannelMojo::CreateClientFactory(
           mojo::edk::ConnectToPeerProcess(mojo::edk::CreateClientHandle(
               mojo::edk::NamedPlatformHandle(socket_path.value()))),
           io_thread_.task_runner().get()),
       this, io_thread_.task_runner().get());
 }
 
-TestShimClient::~TestShimClient() {}
+TestShimClient::~TestShimClient() {
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  io_thread_.Stop();
+}
 
 bool TestShimClient::OnMessageReceived(const IPC::Message& message) {
   return true;
 }
 
 void TestShimClient::OnChannelError() {
   // Client should not get any channel errors for the current set of tests.
   PLOG(FATAL) << "ChannelError";
 }
 
@@ skipping 179 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(AppShimHostManagerBrowserTestSocketFiles,
                        ReplacesSymlinkAndCleansUpFiles) {
   // Get the directory created by AppShimHostManager.
   test::AppShimHostManagerTestApi test_api(
       g_browser_process->platform_part()->app_shim_host_manager());
   directory_in_tmp_ = test_api.directory_in_tmp();
 
   // Check that socket files have been created.
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   EXPECT_TRUE(base::PathExists(directory_in_tmp_));
   EXPECT_TRUE(base::PathExists(symlink_path_));
 
   // Check that the symlink has been replaced.
   base::FilePath socket_path;
   ASSERT_TRUE(base::ReadSymbolicLink(symlink_path_, &socket_path));
   EXPECT_EQ(app_mode::kAppShimSocketShortName, socket_path.BaseName().value());
 
   // Check that the RunningChromeVersion file is correctly written.
   base::FilePath version;
   EXPECT_TRUE(base::ReadSymbolicLink(version_path_, &version));
   EXPECT_EQ(version_info::GetVersionNumber(), version.value());
 }
 
 }  // namespace