Move DidCommitProvisionalLoad code from RenderView to RenderFrame.

content/renderer/render_view_browsertest.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 "base/basictypes.h"
 
 #include "base/memory/shared_memory.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/windows_version.h"
@@ skipping 331 matching lines @@
       "post \0\ndata");
   const unsigned int length = 11;
   const std::vector<unsigned char> post_data(raw_data, raw_data + length);
   nav_params.browser_initiated_post_data = post_data;
 
   view()->OnNavigate(nav_params);
   ProcessPendingMessages();
 
   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
   EXPECT_TRUE(host_nav_params.a.page_state.IsValid());
   const blink::WebHistoryItem item = PageStateToHistoryItem(
       host_nav_params.a.page_state);
   blink::WebHTTPBody body = item.httpBody();
   blink::WebHTTPBody::Element element;
   bool successful = body.elementAt(0, element);
   EXPECT_TRUE(successful);
@@ skipping 233 matching lines @@
   nav_params.current_history_list_offset = 0;
   nav_params.pending_history_list_offset = 0;
   nav_params.page_id = 1;
   nav_params.page_state = state_A;
   view()->OnNavigate(nav_params);
   ProcessPendingMessages();
 
   // 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);
 }
 
 
 // Test that we get the correct UpdateState message when we go back twice
 // quickly without committing.  Regression test for http://crbug.com/58082.
 // Disabled: http://crbug.com/157357 .
 TEST_F(RenderViewImplTest,  DISABLED_LastCommittedUpdateState) {
   // Load page A.
   LoadHTML("<div>Page A</div>");
@@ skipping 978 matching lines @@
 
   // History to merge and no committed pages.
   view()->OnSetHistoryLengthAndPrune(2, -1);
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   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_);
   EXPECT_EQ(0, view()->history_list_offset_);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[0]);
   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_);
   EXPECT_EQ(-1, view()->history_list_offset_);
   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_);
   EXPECT_EQ(0, view()->history_list_offset_);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[0]);
   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_);
   EXPECT_EQ(2, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
   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_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   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_);
   EXPECT_EQ(2, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
   ClearHistory();
 
   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);
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[0]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[1]);
   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);
   EXPECT_EQ(1, view()->history_list_length_);
   EXPECT_EQ(0, view()->history_list_offset_);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[0]);
   ClearHistory();
 
   // 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);
   EXPECT_EQ(2, view()->history_list_length_);
   EXPECT_EQ(1, view()->history_list_offset_);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[0]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[1]);
   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);
   EXPECT_EQ(4, view()->history_list_length_);
   EXPECT_EQ(3, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]);
   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);
   EXPECT_EQ(3, view()->history_list_length_);
   EXPECT_EQ(2, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[2]);
   ClearHistory();
 
   // 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);
   EXPECT_EQ(4, view()->history_list_length_);
   EXPECT_EQ(3, view()->history_list_offset_);
   EXPECT_EQ(-1, view()->history_page_ids_[0]);
   EXPECT_EQ(-1, view()->history_page_ids_[1]);
   EXPECT_EQ(expected_page_id, view()->history_page_ids_[2]);
   EXPECT_EQ(expected_page_id_2, view()->history_page_ids_[3]);
 }
@@ skipping 479 matching lines @@
   view()->webview()->clearFocusedNode();
   const IPC::Message* msg3 = render_thread_->sink().GetFirstMessageMatching(
         ViewHostMsg_FocusedNodeChanged::ID);
   EXPECT_TRUE(msg3);
   ViewHostMsg_FocusedNodeChanged::Read(msg3, &params);
   EXPECT_FALSE(params.a);
   render_thread_->sink().ClearMessages();
 }
 
 }  // namespace content