PlzNavigate: Invoke didStartProvisionalLoad() when the renderer initiates a navigation in startLoad(

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 11 matching lines @@
 #include "components/test_runner/web_frame_test_proxy.h"
 #include "components/test_runner/web_test_delegate.h"
 #include "components/test_runner/web_view_test_proxy.h"
 #include "components/test_runner/web_widget_test_proxy.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
+#include "third_party/WebKit/public/web/WebDataSource.h"
 #include "third_party/WebKit/public/web/WebElement.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebNavigationPolicy.h"
 #include "third_party/WebKit/public/web/WebPluginParams.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
@@ skipping 363 matching lines @@
   }
 }
 
 void WebFrameTestClient::loadErrorPage(int reason) {
   if (test_runner()->shouldDumpFrameLoadCallbacks()) {
     delegate_->PrintMessage(base::StringPrintf(
         "- loadErrorPage: %s\n", net::ErrorToString(reason).c_str()));
   }
 }
 
-void WebFrameTestClient::didStartProvisionalLoad(blink::WebLocalFrame* frame) {
-  test_runner()->tryToSetTopLoadingFrame(frame);
+void WebFrameTestClient::didStartProvisionalLoad(
+    blink::WebDataSource* data_source) {
+  // PlzNavigate
+  // A provisional load notification is received when a frame navigation is
+  // sent to the browser. We don't want to log it again during commit.
+  if (delegate_->IsNavigationInitiatedByRenderer(data_source->getRequest()))
+    return;
+
+  test_runner()->tryToSetTopLoadingFrame(
+      web_frame_test_proxy_base_->web_frame());
 
   if (test_runner()->shouldDumpFrameLoadCallbacks()) {
-    PrintFrameDescription(delegate_, frame);
+    PrintFrameDescription(delegate_, web_frame_test_proxy_base_->web_frame());
     delegate_->PrintMessage(" - didStartProvisionalLoadForFrame\n");
   }
 
   if (test_runner()->shouldDumpUserGestureInFrameLoadCallbacks()) {
-    PrintFrameuserGestureStatus(delegate_, frame,
+    PrintFrameuserGestureStatus(delegate_,
+                                web_frame_test_proxy_base_->web_frame(),
                                 " - in didStartProvisionalLoadForFrame\n");
   }
 }
 
 void WebFrameTestClient::didReceiveServerRedirectForProvisionalLoad(
     blink::WebLocalFrame* frame) {
   if (test_runner()->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->PrintMessage(
         " - didReceiveServerRedirectForProvisionalLoadForFrame\n");
@@ skipping 281 matching lines @@
 blink::WebEffectiveConnectionType
 WebFrameTestClient::getEffectiveConnectionType() {
   return test_runner()->effective_connection_type();
 }
 
 TestRunner* WebFrameTestClient::test_runner() {
   return web_view_test_proxy_base_->test_interfaces()->GetTestRunner();
 }
 
 }  // namespace test_runner