Reland of Accessibility: Ignore all anonymous blocks

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>
 
@@ skipping 179 matching lines @@
     const base::FilePath file_path, const char* file_dir) {
   formatter_.reset(CreateAccessibilityTreeFormatter());
 
   // Disable the "hot tracked" state (set when the mouse is hovering over
   // an object) because it makes test output change based on the mouse position.
   BrowserAccessibilityStateImpl::GetInstance()->
       set_disable_hot_tracking_for_testing(true);
 
   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::FilePath expected_file;
   std::string expected_contents_raw;
   {
     base::ThreadRestrictions::ScopedAllowIO allow_io_for_test_setup;
     base::ReadFileToString(file_path, &html_contents);
 
     // Read the expected file.
     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::ReadFileToString(expected_file, &expected_contents_raw);
   }
 
+  // Output the test path to help anyone who encounters a failure and needs
+  // to know where to look.
+  LOG(INFO) << "Testing: "
+            << file_path.NormalizePathSeparatorsTo('/').LossyDisplayName();
+  LOG(INFO) << "Expected output: "
+            << expected_file.NormalizePathSeparatorsTo('/').LossyDisplayName();
+
   // 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 150 matching lines @@
           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