PlzNavigate: Fix DownloadRequestLimiterTest.DownloadRequestLimiter_RendererInitiated

chrome/browser/download/download_request_limiter_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/download/download_request_limiter.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "build/build_config.h"
@@ skipping 221 matching lines @@
   }
 
   void LoadCompleted() { testing_delegate_.LoadCompleted(web_contents()); }
 
   int AskAllowCount() { return testing_delegate_.AllowCount(); }
 
   void UpdateExpectations(TestingAction action) {
     testing_delegate_.UpdateExpectations(action);
   }
 
-  void NavigateAndCommitWithParams(
-      content::NavigationController::LoadURLParams& params) {
-    controller().LoadURLWithParams(params);
-    content::WebContentsTester::For(web_contents())->CommitPendingNavigation();
-  }
-
   scoped_refptr<DownloadRequestLimiter> download_request_limiter_;
 
   // Number of times ContinueDownload was invoked.
   int continue_count_;
 
   // Number of times CancelDownload was invoked.
   int cancel_count_;
 
   scoped_refptr<HostContentSettingsMap> content_settings_;
   TestingDelegate testing_delegate_;
@@ skipping 99 matching lines @@
   NavigateAndCommit(GURL("http://foo.com/bar"));
   LoadCompleted();
 
   // Do one download so we end up in PROMPT.
   CanDownload();
   ExpectAndResetCounts(1, 0, 0, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Set up a renderer-initiated navigation to the same host.
-  content::NavigationController::LoadURLParams load_params(
-      GURL("http://foo.com/bar2"));
-  load_params.is_renderer_initiated = true;
-  load_params.transition_type = ui::PAGE_TRANSITION_GENERATED;
-  load_params.referrer = content::Referrer();
-  NavigateAndCommitWithParams(load_params);
+  content::RenderFrameHostTester* rfh_tester =
+      content::RenderFrameHostTester::For(web_contents()->GetMainFrame());
+  rfh_tester->NavigateAndCommitRendererInitiated(1, true,
+                                                 GURL("http://foo.com/bar2"));
   LoadCompleted();
 
   // The state should not be reset.
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Renderer-initiated nav to a different host shouldn't reset the state.
-  load_params.url = GURL("http://fooey.com/bar");
-  NavigateAndCommitWithParams(load_params);
+  rfh_tester->NavigateAndCommitRendererInitiated(2, true,
+                                                 GURL("http://fooey.com/bar"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Set up a subframe. Navigations in the subframe shouldn't reset the state.
-  content::RenderFrameHostTester* rfh_tester =
-      content::RenderFrameHostTester::For(web_contents()->GetMainFrame());
   content::RenderFrameHost* subframe = rfh_tester->AppendChild("subframe");
   content::RenderFrameHostTester* subframe_tester =
       content::RenderFrameHostTester::For(subframe);
   subframe_tester->SimulateNavigationCommit(GURL("http://foo.com"));
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   subframe_tester->SimulateNavigationCommit(GURL("http://foobargoo.com"));
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // Set up a blocked state.
   UpdateExpectations(CANCEL);
   CanDownload();
   ExpectAndResetCounts(0, 1, 1, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // The state should not be reset on a renderer-initiated load to either the
   // same host or a different host, in either the main frame or the subframe.
-  load_params.url = GURL("http://fooeybar.com/bar");
-  NavigateAndCommitWithParams(load_params);
+  rfh_tester->NavigateAndCommitRendererInitiated(
+      3, true, GURL("http://fooeybar.com/bar"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
-  load_params.url = GURL("http://foo.com/bar");
-  NavigateAndCommitWithParams(load_params);
+  rfh_tester->NavigateAndCommitRendererInitiated(4, true,
+                                                 GURL("http://foo.com/bar"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   rfh_tester =
       content::RenderFrameHostTester::For(web_contents()->GetMainFrame());
   subframe = rfh_tester->AppendChild("subframe");
   subframe_tester = content::RenderFrameHostTester::For(subframe);
   subframe_tester->SimulateNavigationCommit(GURL("http://foo.com"));
   ASSERT_EQ(DownloadRequestLimiter::DOWNLOADS_NOT_ALLOWED,
@@ skipping 17 matching lines @@
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   UpdateExpectations(ACCEPT);
   CanDownload();
   ExpectAndResetCounts(1, 0, 1, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // The state should not be reset on a pending renderer-initiated load to
   // the same host.
-  load_params.url = GURL("http://foobar.com/bar");
-  NavigateAndCommitWithParams(load_params);
+  rfh_tester =
+      content::RenderFrameHostTester::For(web_contents()->GetMainFrame());
+  rfh_tester->NavigateAndCommitRendererInitiated(5, true,
+                                                 GURL("http://foobar.com/bar"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // The state should not be reset for a subframe nav to the same host.
   rfh_tester =
       content::RenderFrameHostTester::For(web_contents()->GetMainFrame());
   subframe = rfh_tester->AppendChild("subframe");
   subframe_tester = content::RenderFrameHostTester::For(subframe);
   subframe_tester->SimulateNavigationCommit(GURL("http://foobar.com/bar"));
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   subframe_tester->SimulateNavigationCommit(GURL("http://foobarfoo.com/"));
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ALL_DOWNLOADS,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 
   // But a pending load to a different host in the main frame should reset the
   // state.
-  load_params.url = GURL("http://foo.com");
-  NavigateAndCommitWithParams(load_params);
+  rfh_tester->NavigateAndCommitRendererInitiated(6, true,
+                                                 GURL("http://foo.com"));
   LoadCompleted();
   ASSERT_EQ(DownloadRequestLimiter::ALLOW_ONE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 }
 
 TEST_F(DownloadRequestLimiterTest, DownloadRequestLimiter_ResetOnUserGesture) {
   NavigateAndCommit(GURL("http://foo.com/bar"));
   LoadCompleted();
 
   // Do one download, which should change to prompt before download.
@@ skipping 230 matching lines @@
   // changing the content setting).
   UpdateContentSettings(web_contents(), CONTENT_SETTING_ASK);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
   UpdateExpectations(WAIT);
   CanDownload();
   ExpectAndResetCounts(0, 0, 1, __LINE__);
   ASSERT_EQ(DownloadRequestLimiter::PROMPT_BEFORE_DOWNLOAD,
             download_request_limiter_->GetDownloadStatus(web_contents()));
 }