More aggressive IO asserts in content_browsertests.

content/public/test/content_browser_test_utils.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 "content/public/test/content_browser_test_utils.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/pattern.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_restrictions.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/shell_javascript_dialog_manager.h"
 #include "net/base/filename_util.h"
 
 namespace content {
 
 base::FilePath GetTestFilePath(const char* dir, const char* file) {
   base::FilePath path;
+  base::ThreadRestrictions::ScopedAllowIO allow_io_for_path_service;
   PathService::Get(DIR_TEST_DATA, &path);
-  return path.Append(base::FilePath().AppendASCII(dir).Append(
-      base::FilePath().AppendASCII(file)));
+  if (dir)
+    path = path.AppendASCII(dir);
+  return path.AppendASCII(file);
 }
 
 GURL GetTestUrl(const char* dir, const char* file) {
   return net::FilePathToFileURL(GetTestFilePath(dir, file));
 }
 
 void NavigateToURLBlockUntilNavigationsComplete(Shell* window,
                                                 const GURL& url,
                                                 int number_of_navigations) {
   WaitForLoadStop(window->web_contents());
@@ skipping 114 matching lines @@
 
   std::string ascii_message = base::UTF16ToASCII(message);
   if (base::MatchPattern(ascii_message, filter_)) {
     message_ = ascii_message;
     message_loop_runner_->Quit();
   }
   return false;
 }
 
 }  // namespace content