More aggressive IO asserts in content_browsertests.

content/browser/accessibility/dump_accessibility_browsertest_base.cc

 // Copyright 2014 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/browser/accessibility/dump_accessibility_browsertest_base.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/threading/thread_restrictions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/accessibility_tree_formatter.h"
 #include "content/browser/accessibility/accessibility_tree_formatter_blink.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 169 matching lines @@
 
   NavigateToURL(shell(), GURL(url::kAboutBlankURL));
 
   // Output the test path to help anyone who encounters a failure and needs
   // to know where to look.
   LOG(INFO) << "Testing: " << file_path.LossyDisplayName()
             << (is_blink_pass_ ? " (internal Blink accessibility tree)"
                 : " (native accessibility tree for this platform)");
 
   std::string html_contents;
-  base::ReadFileToString(file_path, &html_contents);
+  {
+    base::ThreadRestrictions::ScopedAllowIO allow_io_for_reading_test_input;
+    base::ReadFileToString(file_path, &html_contents);
+  }

[jam, 2016/07/26 23:52:16]

nit: seems more readable to keep this thread restriction scope till line 232

[Łukasz Anforowicz, 2016/07/27 16:18:14]

Done.

 
   // Read the expected file.
   std::string expected_contents_raw;
   base::FilePath expected_file =
       base::FilePath(file_path.RemoveExtension().value() +
                      formatter_->GetExpectedFileSuffix());
-  if (!base::PathExists(expected_file)) {
-    LOG(INFO) << "File not found: " << expected_file.LossyDisplayName();
-    LOG(INFO) << "No expectation file present, ignoring test on this platform."
-              << " To run this test anyway, create "
-              << expected_file.LossyDisplayName()
-              << " (it can be empty) and then run content_browsertests "
-              << "with the switch: --"
-              << switches::kGenerateAccessibilityTestExpectations;
-    return;
+  {
+    base::ThreadRestrictions::ScopedAllowIO allow_io_for_reading_expected_file;
+    if (!base::PathExists(expected_file)) {
+      LOG(INFO) << "File not found: " << expected_file.LossyDisplayName();
+      LOG(INFO)
+          << "No expectation file present, ignoring test on this platform."
+          << " To run this test anyway, create "
+          << expected_file.LossyDisplayName()
+          << " (it can be empty) and then run content_browsertests "
+          << "with the switch: --"
+          << switches::kGenerateAccessibilityTestExpectations;
+      return;
+    }
+    base::ReadFileToString(expected_file, &expected_contents_raw);
   }
-  base::ReadFileToString(expected_file, &expected_contents_raw);
 
   // Tolerate Windows-style line endings (\r\n) in the expected file:
   // normalize by deleting all \r from the file (if any) to leave only \n.
   std::string expected_contents;
   base::RemoveChars(expected_contents_raw, "\r", &expected_contents);
 
   if (!expected_contents.compare(0, strlen(kMarkSkipFile), kMarkSkipFile)) {
     LOG(INFO) << "Skipping this test on this platform.";
     return;
   }
@@ skipping 138 matching lines @@
           "%1s %4d %s\n", is_diff? kSignalDiff : "", line + 1,
              expected_lines[line].c_str());
     }
     diff += "\nActual\n";
     diff += "------\n";
     diff += actual_contents;
     LOG(ERROR) << "Diff:\n" << diff;
 
     if (base::CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kGenerateAccessibilityTestExpectations)) {
+      base::ThreadRestrictions::ScopedAllowIO allow_io_to_write_expected_file;
       CHECK(base::WriteFile(
           expected_file, actual_contents.c_str(), actual_contents.size()));
       LOG(INFO) << "Wrote expectations to: "
                 << expected_file.LossyDisplayName();
     }
   } else {
     LOG(INFO) << "Test output matches expectations.";
   }
 }
 
 }  // namespace content