Cleanup after enabling WPTServe.

content/shell/renderer/layout_test/blink_test_runner.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/shell/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <clocale>
@@ skipping 200 matching lines @@
                   int session_id) override {}
   void Start() override {}
   void Stop() override {}
   void SetVolume(double volume) override {}
   void SetAutomaticGainControl(bool enable) override {}
 
  protected:
   ~MockAudioCapturerSource() override {}
 };
 
-// Tests in web-platform-tests use absolute path links such as
+// Tests in csswg-test use absolute path links such as
 //   <script src="/resources/testharness.js">.
 // Because we load the tests as local files, such links don't work.
 // This function fixes this issue by rewriting file: URLs which were produced
-// from such links so that they point actual files in wpt/.
-WebURL RewriteAbsolutePathInWPT(const std::string& utf8_url) {
+// from such links so that they point actual files in LayoutTests/resources/.
+//
+// Note that this isn't applied to imported/wpt because tests in imported/wpt

[qyearsley, 2017/01/19 18:00:33]

imported -> external

[tkent, 2017/01/19 23:49:59]

Done.

+// are accessed via http.
+WebURL RewriteAbsolutePathInCsswgTest(const std::string& utf8_url) {
   const char kFileScheme[] = "file:///";
   const int kFileSchemeLen = arraysize(kFileScheme) - 1;
   if (utf8_url.compare(0, kFileSchemeLen, kFileScheme, kFileSchemeLen) != 0)
     return WebURL();
   if (utf8_url.find("/LayoutTests/") != std::string::npos)
     return WebURL();
 #if defined(OS_WIN)
   // +3 for a drive letter, :, and /.
   const int kFileSchemeAndDriveLen = kFileSchemeLen + 3;
   if (utf8_url.size() <= kFileSchemeAndDriveLen)
     return WebURL();
   std::string path = utf8_url.substr(kFileSchemeAndDriveLen);
 #else
   std::string path = utf8_url.substr(kFileSchemeLen);
 #endif
   base::FilePath new_path =
       LayoutTestRenderThreadObserver::GetInstance()
           ->webkit_source_dir()
-          .Append(FILE_PATH_LITERAL("LayoutTests/external/wpt/"))
+          .Append(FILE_PATH_LITERAL("LayoutTests/"))

[qyearsley, 2017/01/19 18:00:33]

What does this change do?

[tkent, 2017/01/19 23:49:59]

This CL removes LayoutTests/external/wpt/resources/testharnessreport.js.  We
should refer to LayoutTests/resources/testharnessreport.js.

[qyearsley, 2017/01/20 00:04:46]

Ah - so if the input utf8_url is "file:///resources/testharnessreport.js"
(because the URL in the file is "/resources/testharnessreport.js", then the
returned new URL will be something like
"file:///full/path/to/chromium/src/third_party/WebKit/LayoutTests/resources/testharnessreport.js"
- is that right?

[tkent, 2017/01/20 02:14:04]

Right.

           .AppendASCII(path);
   return WebURL(net::FilePathToFileURL(new_path));
 }
 
 }  // namespace
 
 BlinkTestRunner::BlinkTestRunner(RenderView* render_view)
     : RenderViewObserver(render_view),
       RenderViewObserverTracker<BlinkTestRunner>(render_view),
       is_main_window_(false),
@@ skipping 92 matching lines @@
   std::string contents_base64;
   base::Base64Encode(contents, &contents_base64);
 
   const char data_url_prefix[] = "data:text/css:charset=utf-8;base64,";
   return WebURL(GURL(data_url_prefix + contents_base64));
 }
 
 WebURL BlinkTestRunner::RewriteLayoutTestsURL(const std::string& utf8_url,
                                               bool is_wpt_mode) {
   if (is_wpt_mode) {
-    WebURL rewritten_url = RewriteAbsolutePathInWPT(utf8_url);
+    WebURL rewritten_url = RewriteAbsolutePathInCsswgTest(utf8_url);
     if (!rewritten_url.isEmpty())
       return rewritten_url;
     return WebURL(GURL(utf8_url));
   }
 
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen))
     return WebURL(GURL(utf8_url));
@@ skipping 662 matching lines @@
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 void BlinkTestRunner::OnDestruct() {
   delete this;
 }
 
 }  // namespace content