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

chrome/browser/media_galleries/media_galleries_test_util.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 "chrome/browser/media_galleries/media_galleries_test_util.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 63 matching lines @@
 EnsureMediaDirectoriesExists::EnsureMediaDirectoriesExists()
     : num_galleries_(0), times_overrides_changed_(0) {
   Init();
 }
 
 EnsureMediaDirectoriesExists::~EnsureMediaDirectoriesExists() {
 #if defined(OS_MACOSX)
   iapps::SetMacPreferencesForTesting(NULL);
   picasa::SetMacPreferencesForTesting(NULL);
 #endif  // OS_MACOSX
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
+  ignore_result(fake_dir_.Delete());
 }
 
 void EnsureMediaDirectoriesExists::ChangeMediaPathOverrides() {
   // Each pointer must be reset an extra time so as to destroy the existing
   // override prior to creating a new one. This is because the PathService,
   // which supports these overrides, only allows one override to exist per path
   // in its internal bookkeeping; attempting to add a second override invokes
   // a CHECK crash.
   music_override_.reset();
   std::string music_path_string("music");
@@ skipping 15 matching lines @@
   video_override_.reset(new base::ScopedPathOverride(
       chrome::DIR_USER_VIDEOS,
       fake_dir_.GetPath().AppendASCII(videos_path_string)));
 
   times_overrides_changed_++;
 
   num_galleries_ = 3;
 }
 
 base::FilePath EnsureMediaDirectoriesExists::GetFakeAppDataPath() const {
+  base::ThreadRestrictions::ScopedAllowIO allow_io;
   DCHECK(fake_dir_.IsValid());
   return fake_dir_.GetPath().AppendASCII("appdata");
 }
 
 #if defined(OS_WIN)
 base::FilePath EnsureMediaDirectoriesExists::GetFakeLocalAppDataPath() const {
   DCHECK(fake_dir_.IsValid());
   return fake_dir_.GetPath().AppendASCII("localappdata");
 }
 
@@ skipping 74 matching lines @@
 
 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
 #if defined(OS_WIN)
   return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
 #elif defined(OS_POSIX)
   return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
 #else
   NOTREACHED();
 #endif
 }