Move DidCommitProvisionalLoad code from RenderView to RenderFrame.

content/test/test_render_view_host.h

 // 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.
 
 #ifndef CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 #define CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/test/test_render_frame_host.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/vector2d_f.h"
 
 // This file provides a testing framework for mocking out the RenderProcessHost
 // layer. It allows you to test RenderViewHost, WebContentsImpl,
 // NavigationController, and other layers above that without running an actual
 // renderer process.
 //
 // To use, derive your test base class from RenderViewHostImplTestHarness.
 
-struct ViewHostMsg_FrameNavigate_Params;
+struct FrameHostMsg_DidCommitProvisionalLoad_Params;
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 
 class SiteInstance;
 class TestRenderFrameHost;
 class TestWebContents;
 
 // Utility function to initialize ViewHostMsg_NavigateParams_Params
 // with given |page_id|, |url| and |transition_type|.
-void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
+void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int page_id,
                         const GURL& url,
                         PageTransition transition_type);
 
 // TestRenderViewHostView ------------------------------------------------------
 
 // Subclass the RenderViewHost's view so that we can call Show(), etc.,
 // without having side-effects.
 class TestRenderWidgetHostView : public RenderWidgetHostViewBase {
  public:
@@ skipping 176 matching lines @@
                      RenderViewHostDelegate* delegate,
                      RenderWidgetHostDelegate* widget_delegate,
                      int routing_id,
                      int main_frame_routing_id,
                      bool swapped_out);
   virtual ~TestRenderViewHost();
 
   // RenderViewHostTester implementation.  Note that CreateRenderView
   // is not specified since it is synonymous with the one from
   // RenderViewHostImpl, see below.
-  virtual void SendNavigate(int page_id, const GURL& url) OVERRIDE;
-  virtual void SendFailedNavigate(int page_id, const GURL& url) OVERRIDE;
-  virtual void SendNavigateWithTransition(int page_id, const GURL& url,
-                                          PageTransition transition) OVERRIDE;
   virtual void SendShouldCloseACK(bool proceed) OVERRIDE;
   virtual void SetContentsMimeType(const std::string& mime_type) OVERRIDE;
   virtual void SimulateSwapOutACK() OVERRIDE;
   virtual void SimulateWasHidden() OVERRIDE;
   virtual void SimulateWasShown() OVERRIDE;
 
+  // NOTE: These methods are deprecated and the equivalents in
+  // TestRenderFrameHost should be used.
+  virtual void SendNavigate(int page_id, const GURL& url) OVERRIDE;
+  virtual void SendFailedNavigate(int page_id, const GURL& url) OVERRIDE;
+  virtual void SendNavigateWithTransition(int page_id, const GURL& url,
+                                          PageTransition transition) OVERRIDE;
+
   // Calls OnNavigate on the RenderViewHost with the given information,
   // including a custom original request URL.  Sets the rest of the
   // parameters in the message to the "typical" values.  This is a helper
   // function for simulating the most common types of loads.
   void SendNavigateWithOriginalRequestURL(
       int page_id, const GURL& url, const GURL& original_request_url);
 
   void SendNavigateWithFile(
       int page_id, const GURL& url, const base::FilePath& file_path);
 
-  void SendNavigateWithParams(ViewHostMsg_FrameNavigate_Params* params);
+  void SendNavigateWithParams(
+      FrameHostMsg_DidCommitProvisionalLoad_Params* params);
 
   void TestOnUpdateStateWithFile(
       int process_id, const base::FilePath& file_path);
 
   void TestOnStartDragging(const DropData& drop_data);
 
   // If set, *delete_counter is incremented when this object destructs.
   void set_delete_counter(int* delete_counter) {
     delete_counter_ = delete_counter;
   }
@@ skipping 22 matching lines @@
   void set_is_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
   }
 
   // If set, navigations will appear to have loaded through a proxy
   // (ViewHostMsg_FrameNavigte_Params::was_fetched_via_proxy).
   // False by default.
   void set_simulate_fetch_via_proxy(bool proxy);
 
   // If set, navigations will appear to have cleared the history list in the
-  // RenderView (ViewHostMsg_FrameNavigate_Params::history_list_was_cleared).
+  // RenderView
+  // (FrameHostMsg_DidCommitProvisionalLoad_Params::history_list_was_cleared).
   // False by default.
   void set_simulate_history_list_was_cleared(bool cleared);
 
   // The opener route id passed to CreateRenderView().
   int opener_route_id() const { return opener_route_id_; }
 
   // TODO(creis): Remove the need for these methods.
   TestRenderFrameHost* main_render_frame_host() const {
     return main_render_frame_host_;
   }
@@ skipping 70 matching lines @@
  private:
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImplTestHarness);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_TEST_RENDER_VIEW_HOST_H_