PlzNavigate: Eliminate test_runner bailing out of layout tests too early

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 493 matching lines @@
   }
 }
 
 void WebFrameTestClient::didFinishLoad(blink::WebLocalFrame* frame) {
   if (test_runner_->shouldDumpFrameLoadCallbacks()) {
     PrintFrameDescription(delegate_, frame);
     delegate_->PrintMessage(" - didFinishLoadForFrame\n");
   }
 }
 
+void WebFrameTestClient::didNavigateWithinPage(
+    blink::WebLocalFrame* frame,
+    const blink::WebHistoryItem& history_item,
+    blink::WebHistoryCommitType commit_type,
+    bool contentInitiated) {
+  test_runner_->OnNavigationEnd();

[clamy, 2016/07/27 16:57:05]

Based on what we discussed offline, do you still need to call OnNavigationEnd if
we navigate in-page?

[blundell, 2016/07/29 15:02:46]

Yes, it's needed: there is at least one test where didStartLoading() is called
but neither didStartProvisionalLoadForFrame() nor didStopLoading() is ever
called. This patch needs the callback from didNavigateWithPage() to avoid that
test hanging. 

+}
+
+void WebFrameTestClient::didStartLoading(bool to_different_document) {
+  test_runner_->OnNavigationBegin();
+}
+
 void WebFrameTestClient::didStopLoading() {
   test_runner_->tryToClearTopLoadingFrame(
       web_frame_test_proxy_base_->web_frame());
 }
 
 void WebFrameTestClient::didDetectXSS(const blink::WebURL& insecure_url,
                                       bool did_block_entire_page) {
   if (test_runner_->shouldDumpFrameLoadCallbacks())
     delegate_->PrintMessage("didDetectXSS\n");
 }
@@ skipping 230 matching lines @@
 
 bool WebFrameTestClient::runFileChooser(
     const blink::WebFileChooserParams& params,
     blink::WebFileChooserCompletion* completion) {
   delegate_->PrintMessage("Mock: Opening a file chooser.\n");
   // FIXME: Add ability to set file names to a file upload control.
   return false;
 }
 
 }  // namespace test_runner