Set navigationStart correctly for all load types.

content/public/test/render_view_test.cc

Index: content/public/test/render_view_test.cc
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc
index 72c1e356c0fdb5da2c37510cabef3fbe29f2c6dc..27104286e96bdc254cb6c56433eeb6615420b8b5 100644
--- a/content/public/test/render_view_test.cc
+++ b/content/public/test/render_view_test.cc
@@ -78,6 +78,7 @@ const int32_t kMainFrameRouteId = 6;
 // https://crbug.com/545684
 const int32_t kMainFrameWidgetRouteId = 5;
 const int32_t kNewWindowRouteId = 7;
+const int32_t kNewWindowMainFrameRouteId = 8;
 const int32_t kNewFrameRouteId = 10;
 const int32_t kNewFrameWidgetRouteId = 7;
 
@@ -114,6 +115,9 @@ namespace content {
 class RendererBlinkPlatformImplTestOverrideImpl
     : public RendererBlinkPlatformImpl {
  public:
+  using WebURLLoaderFactory = RenderViewTest::
+      RendererBlinkPlatformImplTestOverride::WebURLLoaderFactory;
+
   RendererBlinkPlatformImplTestOverrideImpl(
       scheduler::RendererScheduler* scheduler)
       : RendererBlinkPlatformImpl(scheduler, nullptr) {
@@ -122,6 +126,19 @@ class RendererBlinkPlatformImplTestOverrideImpl
   // Get rid of the dependency to the sandbox, which is not available in
   // RenderViewTest.
   blink::WebSandboxSupport* sandboxSupport() override { return NULL; }
+
+  blink::WebURLLoader* createURLLoader() override {
+    if (!url_loader_factory_.is_null())
+      return url_loader_factory_.Run();
+    return RendererBlinkPlatformImpl::createURLLoader();
+  }
+
+  void SetWebURLLoaderFactory(const WebURLLoaderFactory& factory) {
+    url_loader_factory_ = factory;
+  }
+
+ private:
+  WebURLLoaderFactory url_loader_factory_;
 };
 
 RenderViewTest::RendererBlinkPlatformImplTestOverride::
@@ -145,6 +162,11 @@ void RenderViewTest::RendererBlinkPlatformImplTestOverride::Shutdown() {
   blink_platform_impl_->Shutdown();
 }
 
+void RenderViewTest::RendererBlinkPlatformImplTestOverride::
+    SetWebURLLoaderFactory(const WebURLLoaderFactory& factory) {
+  blink_platform_impl_->SetWebURLLoaderFactory(factory);
+}
+
 RenderViewTest::RenderViewTest()
     : view_(NULL) {
   RenderFrameImpl::InstallCreateHook(&TestRenderFrame::CreateTestRenderFrame);
@@ -257,6 +279,8 @@ void RenderViewTest::SetUp() {
     render_thread_.reset(new MockRenderThread());
   render_thread_->set_routing_id(kRouteId);
   render_thread_->set_new_window_routing_id(kNewWindowRouteId);
+  render_thread_->set_new_window_main_frame_routing_id(
+      kNewWindowMainFrameRouteId);
   render_thread_->set_new_window_main_frame_widget_routing_id(
       kNewFrameWidgetRouteId);
   render_thread_->set_new_frame_routing_id(kNewFrameRouteId);