content_shell: Update absolute path rewriting logic again.

components/test_runner/web_frame_test_client.cc

 // Copyright 2016 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 "components/test_runner/web_frame_test_client.h"
 
 #include <memory>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
@@ skipping 580 matching lines @@
           !main_document_url.SchemeIs(url::kHttpsScheme)) ||
          IsLocalHost(main_document_url.host())) &&
         !delegate_->AllowExternalPages()) {
       delegate_->PrintMessage(std::string("Blocked access to external URL ") +
                               request_url + "\n");
       BlockRequest(request);
       return;
     }
   }
 
-  if (!test_runner_->did_request_after_reset()) {
-    test_runner_->set_did_request_after_reset();
-    return;
-  }
   // Set the new substituted URL.
-  request.setURL(
-      delegate_->RewriteLayoutTestsURL(request.url().string().utf8()));
+  request.setURL(delegate_->RewriteLayoutTestsURL(
+      request.url().string().utf8(),
+      test_runner_->is_web_platform_tests_mode()));
 }
 
 void WebFrameTestClient::didReceiveResponse(
     unsigned identifier,
     const blink::WebURLResponse& response) {
   if (test_runner_->shouldDumpResourceLoadCallbacks()) {
     if (resource_identifier_map_.find(identifier) ==
         resource_identifier_map_.end())
       delegate_->PrintMessage("<unknown>");
     else
@@ skipping 131 matching lines @@
   else
     callback->onError(blink::WebSetSinkIdError::NotFound);
 }
 
 void WebFrameTestClient::didClearWindowObject(blink::WebLocalFrame* frame) {
   web_test_proxy_base_->test_interfaces()->BindTo(frame);
   web_test_proxy_base_->BindTo(frame);
 }
 
 }  // namespace test_runner