PlzNavigate: Eliminate test_runner bailing out of layout tests too early

components/test_runner/test_runner.h

 // 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.
 
 #ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 #define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
 #include <deque>
@@ skipping 81 matching lines @@
       const base::Callback<void(const SkBitmap&)>& callback) override;
   void ReplicateLayoutTestRuntimeFlagsChanges(
       const base::DictionaryValue& changed_values) override;
   bool HasCustomTextDump(std::string* custom_text_dump) const override;
   bool ShouldDumpBackForwardList() const override;
   blink::WebContentSettingsClient* GetWebContentSettings() const override;
   void InitializeWebViewWithMocks(blink::WebView* web_view) override;
   void SetFocus(blink::WebView* web_view, bool focus) override;
 
   // Methods used by WebViewTestClient and WebFrameTestClient.
+  void OnNavigationBegin() { is_navigating_ = true; }
+  void OnNavigationEnd() { is_navigating_ = false; }
   void OnAnimationScheduled(blink::WebWidget* widget);
   void OnAnimationBegun(blink::WebWidget* widget);
   std::string GetAcceptLanguages() const;
   bool shouldStayOnPageAfterHandlingBeforeUnload() const;
   MockScreenOrientationClient* getMockScreenOrientationClient();
   MockWebUserMediaClient* getMockWebUserMediaClient();
   MockWebSpeechRecognizer* getMockWebSpeechRecognizer();
   bool isPrinting() const;
   bool shouldDumpAsCustomText() const;
   std:: string customDumpText() const;
@@ skipping 495 matching lines @@
   blink::WebView* main_view_;
 
   // This is non-0 IFF a load is in progress.
   blink::WebFrame* top_loading_frame_;
 
   // WebContentSettingsClient mock object.
   std::unique_ptr<MockContentSettingsClient> mock_content_settings_client_;
 
   bool use_mock_theme_;
 
+  // This is true in the period between the start of a navigation and when that
+  // navigation commits or fails. Note that when browser-side navigation is
+  // enabled there is an arbitrary gap between these two events.

[clamy, 2016/07/19 13:50:35]

Wouldn't that be the case in the current architecture as well, since we need the
browser to fetch the resource in both cases?

[blundell, 2016/07/21 10:02:18]

Yes, good point. The PlzNavigate-specific gap is between navigation being
started and WebFrameClient::didStartProvisionalLoad(frame*) being called. It's
the latter callback that causes TestRunner's tryToSetTopLoadingFrame(frame*) to
be invoked, which TestRunner relies on for detecting that a load is active.

Updated the comment to be precise.

+  bool is_navigating_;
+
   std::unique_ptr<MockCredentialManagerClient> credential_manager_client_;
   std::unique_ptr<MockScreenOrientationClient> mock_screen_orientation_client_;
   std::unique_ptr<MockWebSpeechRecognizer> speech_recognizer_;
   std::unique_ptr<MockWebUserMediaClient> user_media_client_;
   std::unique_ptr<SpellCheckClient> spellcheck_;
 
   // Number of currently active color choosers.
   int chooser_count_;
 
   // Captured drag image.
@@ skipping 10 matching lines @@
   bool is_web_platform_tests_mode_;
 
   base::WeakPtrFactory<TestRunner> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TestRunner);
 };
 
 }  // namespace test_runner
 
 #endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_