Use WebFrame::loadRequest for reloads and history navigations

content/public/test/render_view_test.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/public/test/render_view_test.h"
 
 #include <cctype>
 
 #include "base/run_loop.h"
 #include "components/scheduler/renderer/renderer_scheduler.h"
 #include "content/common/dom_storage/dom_storage_types.h"
 #include "content/common/frame_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/test/frame_load_waiter.h"
 #include "content/renderer/history_controller.h"
 #include "content/renderer/history_serialization.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/renderer_blink_platform_impl.h"
 #include "content/renderer/renderer_main_platform_delegate.h"
 #include "content/test/fake_compositor_dependencies.h"
@@ skipping 510 matching lines @@
       FrameMsg_Navigate_Type::NORMAL, true, base::TimeTicks(),
       FrameMsg_UILoadMetricsReportType::NO_REPORT, GURL(), GURL());
   RequestNavigationParams request_params;
   request_params.page_state = state;
   request_params.page_id = impl->page_id_ + offset;
   request_params.nav_entry_id = pending_offset + 1;
   request_params.pending_history_list_offset = pending_offset;
   request_params.current_history_list_offset = impl->history_list_offset_;
   request_params.current_history_list_length = history_list_length;
 
-  impl->GetMainRenderFrame()->OnNavigate(common_params, StartNavigationParams(),
-                                         request_params);
+  // PlzNavigate
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableBrowserSideNavigation)) {
+    impl->GetMainRenderFrame()->OnCommitNavigation(

[Charlie Reis, 2015/05/27 23:34:35]

This feels strange to pass both common_params.url and common_params.  I thought
the first URL was supposed to be a stream identifier?

[clamy, 2015/05/29 14:47:01]

Yes. This was testing code that I removed in the latest patch set that I forgot
to upload before sending the cL out for review :).

+        ResourceResponseHead(), common_params.url, common_params,
+        request_params);
+  } else {
+    impl->GetMainRenderFrame()->OnNavigate(
+        common_params, StartNavigationParams(), request_params);
+  }
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(view_->GetMainRenderFrame()).Wait();
 }
 
 }  // namespace content