Set navigationStart correctly for all load types.

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 <stddef.h>
 
 #include <cctype>
 
@@ skipping 60 matching lines @@
 
 namespace {
 
 const int32_t kRouteId = 5;
 const int32_t kMainFrameRouteId = 6;
 // TODO(avi): Widget routing IDs should be distinct from the view routing IDs,
 // once RenderWidgetHost is distilled from RenderViewHostImpl.
 // 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;
 
 // Converts |ascii_character| into |key_code| and returns true on success.
 // Handles only the characters needed by tests.
 bool GetWindowsKeyCode(char ascii_character, int* key_code) {
   if (isalnum(ascii_character)) {
     *key_code = base::ToUpperASCII(ascii_character);
     return true;
   }
@@ skipping 16 matching lines @@
   }
 }
 
 }  // namespace
 
 namespace content {
 
 class RendererBlinkPlatformImplTestOverrideImpl
     : public RendererBlinkPlatformImpl {
  public:
+  using WebURLLoaderFactory = RenderViewTest::
+      RendererBlinkPlatformImplTestOverride::WebURLLoaderFactory;
+
   RendererBlinkPlatformImplTestOverrideImpl(
       scheduler::RendererScheduler* scheduler)
       : RendererBlinkPlatformImpl(scheduler, nullptr) {
   }
 
   // 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::
     RendererBlinkPlatformImplTestOverride() {
   renderer_scheduler_ = scheduler::RendererScheduler::Create();
   blink_platform_impl_.reset(
       new RendererBlinkPlatformImplTestOverrideImpl(renderer_scheduler_.get()));
 }
 
 RenderViewTest::RendererBlinkPlatformImplTestOverride::
     ~RendererBlinkPlatformImplTestOverride() {
 }
 
 blink::Platform*
     RenderViewTest::RendererBlinkPlatformImplTestOverride::Get() const {
   return blink_platform_impl_.get();
 }
 
 void RenderViewTest::RendererBlinkPlatformImplTestOverride::Shutdown() {
   renderer_scheduler_->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);
 }
 
 RenderViewTest::~RenderViewTest() {
 }
 
 void RenderViewTest::ProcessPendingMessages() {
   msg_loop_.task_runner()->PostTask(FROM_HERE,
@@ skipping 92 matching lines @@
   // font IPCs, causing all font loading to fail.
   SetDWriteFontProxySenderForTesting(CreateFakeCollectionSender());
 #endif
 
   // Subclasses can set render_thread_ with their own implementation before
   // calling RenderViewTest::SetUp().
   if (!render_thread_)
     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);
 
 #if defined(OS_MACOSX)
   autorelease_pool_.reset(new base::mac::ScopedNSAutoreleasePool());
 #endif
   command_line_.reset(new base::CommandLine(base::CommandLine::NO_PROGRAM));
   params_.reset(new MainFunctionParams(*command_line_));
   platform_.reset(new RendererMainPlatformDelegate(*params_));
@@ skipping 398 matching lines @@
       static_cast<TestRenderFrame*>(impl->GetMainRenderFrame());
   frame->Navigate(common_params, StartNavigationParams(), request_params);
 
   // The load actually happens asynchronously, so we pump messages to process
   // the pending continuation.
   FrameLoadWaiter(frame).Wait();
   view_->GetWebView()->updateAllLifecyclePhases();
 }
 
 }  // namespace content