summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_view_browsertest.cc
diff options
context:
space:
mode:
authornasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 22:10:53 +0000
committernasko@chromium.org <nasko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-06 22:10:53 +0000
commitade94b3ec1d1edfd5c527e7a33bab543d0bef04f (patch)
treed83db6bfb1433bf80d5c7e95e4fe81928af9bbb8 /content/renderer/render_view_browsertest.cc
parentd1ddf8c5d6e674664c91d8d557231e91ed7b3832 (diff)
downloadchromium_src-ade94b3ec1d1edfd5c527e7a33bab543d0bef04f.zip
chromium_src-ade94b3ec1d1edfd5c527e7a33bab543d0bef04f.tar.gz
chromium_src-ade94b3ec1d1edfd5c527e7a33bab543d0bef04f.tar.bz2
Move DidCommitProvisionalLoad code from RenderView to RenderFrame.
BUG=304341 R=creis@chromium.org Review URL: https://codereview.chromium.org/135723003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest.cc')
-rw-r--r--content/renderer/render_view_browsertest.cc50
1 files changed, 26 insertions, 24 deletions
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc
index fc19d54..3a38ff2 100644
--- a/content/renderer/render_view_browsertest.cc
+++ b/content/renderer/render_view_browsertest.cc
@@ -349,11 +349,12 @@ TEST_F(RenderViewImplTest, OnNavigationHttpPost) {
const IPC::Message* frame_navigate_msg =
render_thread_->sink().GetUniqueMessageMatching(
- ViewHostMsg_FrameNavigate::ID);
+ FrameHostMsg_DidCommitProvisionalLoad::ID);
EXPECT_TRUE(frame_navigate_msg);
- ViewHostMsg_FrameNavigate::Param host_nav_params;
- ViewHostMsg_FrameNavigate::Read(frame_navigate_msg, &host_nav_params);
+ FrameHostMsg_DidCommitProvisionalLoad::Param host_nav_params;
+ FrameHostMsg_DidCommitProvisionalLoad::Read(frame_navigate_msg,
+ &host_nav_params);
EXPECT_TRUE(host_nav_params.a.is_post);
// Check post data sent to browser matches
@@ -607,12 +608,13 @@ TEST_F(RenderViewImplTest, ReloadWhileSwappedOut) {
// Verify page A committed, not swappedout://.
const IPC::Message* frame_navigate_msg =
render_thread_->sink().GetUniqueMessageMatching(
- ViewHostMsg_FrameNavigate::ID);
+ FrameHostMsg_DidCommitProvisionalLoad::ID);
EXPECT_TRUE(frame_navigate_msg);
// Read URL out of the parent trait of the params object.
- ViewHostMsg_FrameNavigate::Param commit_params;
- ViewHostMsg_FrameNavigate::Read(frame_navigate_msg, &commit_params);
+ FrameHostMsg_DidCommitProvisionalLoad::Param commit_params;
+ FrameHostMsg_DidCommitProvisionalLoad::Read(frame_navigate_msg,
+ &commit_params);
EXPECT_NE(GURL("swappedout://"), commit_params.a.url);
}
@@ -1611,7 +1613,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// No history to merge and a committed page to be kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(0, expected_page_id);
EXPECT_EQ(1, view()->history_list_length_);
@@ -1620,7 +1622,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// No history to merge and a committed page to be pruned.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(0, expected_page_id + 1);
EXPECT_EQ(0, view()->history_list_length_);
@@ -1628,7 +1630,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// No history to merge and a committed page that the browser was unaware of.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(0, -1);
EXPECT_EQ(1, view()->history_list_length_);
@@ -1637,7 +1639,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// History to merge and a committed page to be kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(2, expected_page_id);
EXPECT_EQ(3, view()->history_list_length_);
@@ -1648,7 +1650,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// History to merge and a committed page to be pruned.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(2, expected_page_id + 1);
EXPECT_EQ(2, view()->history_list_length_);
@@ -1658,7 +1660,7 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// History to merge and a committed page that the browser was unaware of.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
view()->OnSetHistoryLengthAndPrune(2, -1);
EXPECT_EQ(3, view()->history_list_length_);
@@ -1671,9 +1673,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
int expected_page_id_2 = -1;
// No history to merge and two committed pages, both to be kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(0, expected_page_id);
@@ -1684,9 +1686,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// No history to merge and two committed pages, and only the second is kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(0, expected_page_id_2);
@@ -1697,9 +1699,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
// No history to merge and two committed pages, both of which the browser was
// unaware of.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(0, -1);
@@ -1710,9 +1712,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// History to merge and two committed pages, both to be kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(2, expected_page_id);
@@ -1725,9 +1727,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
ClearHistory();
// History to merge and two committed pages, and only the second is kept.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(2, expected_page_id_2);
@@ -1740,9 +1742,9 @@ TEST_F(RenderViewImplTest, SetHistoryLengthAndPrune) {
// History to merge and two committed pages, both of which the browser was
// unaware of.
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id = view()->page_id_;
- view()->didCommitProvisionalLoad(GetMainFrame(), true);
+ frame()->didCommitProvisionalLoad(GetMainFrame(), true);
expected_page_id_2 = view()->page_id_;
EXPECT_GT(expected_page_id_2, expected_page_id);
view()->OnSetHistoryLengthAndPrune(2, -1);
generated by cgit v1.1 at 2025-03-19 03:20:48 +0000