[RDS] Reloads a page using the original request URL

content/browser/renderer_host/test_render_view_host.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 "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/test_web_contents.h"
 #include "content/common/view_messages.h"
@@ skipping 203 matching lines @@
     bool swapped_out)
     : RenderViewHostImpl(instance,
                          delegate,
                          widget_delegate,
                          routing_id,
                          swapped_out,
                          dom_storage::kInvalidSessionStorageNamespaceId),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
-      contents_mime_type_("text/html") {
+      contents_mime_type_("text/html"),
+      last_params_(new ViewMsg_Navigate_Params) {
   // For normal RenderViewHosts, this is freed when |Shutdown()| is
   // called.  For TestRenderViewHost, the view is explicitly
   // deleted in the destructor below, because
   // TestRenderWidgetHostView::Destroy() doesn't |delete this|.
   SetView(new TestRenderWidgetHostView(this));
 }
 
 TestRenderViewHost::~TestRenderViewHost() {
   if (delete_counter_)
     ++*delete_counter_;
 
   // Since this isn't a traditional view, we have to delete it.
   delete GetView();
+  delete last_params_;
 }
 
 bool TestRenderViewHost::CreateRenderView(
     const string16& frame_name,
     int opener_route_id,
     int32 max_page_id,
     const std::string& embedder_channel_name,
     int embedder_container_id) {
   DCHECK(!render_view_created_);
   render_view_created_ = true;
   return true;
 }
 
 bool TestRenderViewHost::IsRenderViewLive() const {
   return render_view_created_;
 }
 
+void TestRenderViewHost::Navigate(const ViewMsg_Navigate_Params& params) {
+  *last_params_ = params;

[jam, 2012/07/03 05:50:12]

i think there's a simpler way to get the url instead of making Navigate virtual
just for testing, and caching the params and having a getter for it on this
class.

the test can add a RenderViewHostObserver, and its Navigate function will get
called with the url

[gone, 2012/07/03 18:24:39]

Done.

+  RenderViewHostImpl::Navigate(params);
+}
+
 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) {
   SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK);
 }
 
 void TestRenderViewHost::SendNavigateWithTransition(
     int page_id, const GURL& url, PageTransition transition) {
+  SendNavigateWithParameters(page_id, url, transition, url);
+}
+
+void TestRenderViewHost::SendNavigateWithOriginalRequestURL(
+    int page_id, const GURL& url, const GURL& original_request_url) {
+  SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
+      original_request_url);
+}
+
+void TestRenderViewHost::SendNavigateWithParameters(
+    int page_id, const GURL& url, PageTransition transition,
+    const GURL& original_request_url) {
   ViewHostMsg_FrameNavigate_Params params;
 
   params.page_id = page_id;
   params.url = url;
   params.referrer = Referrer();
   params.transition = transition;
   params.redirects = std::vector<GURL>();
   params.should_update_history = true;
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
   params.password_form = PasswordForm();
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.contents_mime_type = contents_mime_type_;
   params.is_post = false;
   params.was_within_same_page = false;
   params.http_status_code = 0;
   params.socket_address.set_host("2001:db8::1");
   params.socket_address.set_port(80);
   params.was_fetched_via_proxy = simulate_fetch_via_proxy_;
   params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(url));
+  params.original_request_url = original_request_url;
 
   ViewHostMsg_FrameNavigate msg(1, params);
   OnMsgNavigate(msg);
 }
 
 void TestRenderViewHost::SendShouldCloseACK(bool proceed) {
   OnMsgShouldCloseACK(proceed, base::TimeTicks(), base::TimeTicks());
 }
 
 void TestRenderViewHost::SetContentsMimeType(const std::string& mime_type) {
@@ skipping 38 matching lines @@
 
 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
   return static_cast<TestRenderViewHost*>(active_rvh());
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content