Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2321)

Unified Diff: content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc

Issue 2639073002: Convert OverscrollNavigationOverlayTest.ImmediateLoadOnNavigate to use the new navigation callbacks… (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc
diff --git a/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc b/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc
index 771b042ad997cf4949f495ede0337f4371d965ed..7263fb2e79c77c2191ad46b03694d9a463e86c7d 100644
--- a/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc
+++ b/content/browser/web_contents/aura/overscroll_navigation_overlay_unittest.cc
@@ -40,11 +40,22 @@ class ImmediateLoadObserver : WebContentsObserver {
}
~ImmediateLoadObserver() override {}
+ // TODO: remove this method when PlzNavigate is turned on by default.
void DidStartNavigationToPendingEntry(const GURL& url,
ReloadType reload_type) override {
- // Simulate immediate web page load.
- contents_->TestSetIsLoading(false);
- Observe(nullptr);
+ if (!IsBrowserSideNavigationEnabled()) {
+ // Simulate immediate web page load.
+ contents_->TestSetIsLoading(false);
+ Observe(nullptr);
+ }
+ }
+
+ void DidStartNavigation(NavigationHandle* navigation_handlee) override {
+ if (IsBrowserSideNavigationEnabled()) {
+ // Simulate immediate web page load.
+ contents_->TestSetIsLoading(false);
+ Observe(nullptr);
+ }
}
private:
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698