Fix some unit_tests under PlzNavigate

content/public/test/test_renderer_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/public/test/test_renderer_host.h"
 
 #include <utility>
 
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "content/browser/compositor/test/no_transport_image_transport_factory.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/test/browser_side_navigation_test_utils.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_context.h"
-#include "content/test/browser_side_navigation_test_utils.h"
 #include "content/test/content_browser_sanity_checker.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_render_frame_host_factory.h"
 #include "content/test/test_render_view_host.h"
 #include "content/test/test_render_view_host_factory.h"
 #include "content/test/test_web_contents.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/test/material_design_controller_test_api.h"
 
 #if defined(OS_ANDROID)
@@ skipping 17 matching lines @@
 namespace content {
 
 // RenderFrameHostTester ------------------------------------------------------
 
 // static
 RenderFrameHostTester* RenderFrameHostTester::For(RenderFrameHost* host) {
   return static_cast<TestRenderFrameHost*>(host);
 }
 
 // static
 RenderFrameHost* RenderFrameHostTester::GetPendingForController(

[nasko, 2016/08/31 18:39:05]

Considering that only browser_with_test_window_test.cc is the user of this
method, can't we just eliminate it in general or just invoke a content-exposed
version of what it does? I saw the discussion about areas of code not using
TestWebContents, but these are already hacks, so why not expose this through
this object (RenderFrameHostTester)?

[scottmg, 2016/08/31 19:01:46]

Ah, I didn't notice it was the only user.

I'm not sure I understood the various "this"es in your comment. :) Do you mean
having a helper method here that does CommitPendingLoad's work for a given
controller so that it's sort of inside content at least?

[scottmg, 2016/08/31 19:40:34]

Did ... something like that. (maybe?)

     NavigationController* controller) {
   WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
       controller->GetWebContents());
+  if (IsBrowserSideNavigationEnabled()) {
+    return web_contents->GetRenderManagerForTesting()
+        ->speculative_render_frame_host_.get();
+  }
   return web_contents->GetRenderManagerForTesting()->pending_frame_host();
 }
 
 // RenderViewHostTester -------------------------------------------------------
 
 // static
 RenderViewHostTester* RenderViewHostTester::For(RenderViewHost* host) {
   return static_cast<TestRenderViewHost*>(host);
 }
 
@@ skipping 205 matching lines @@
 BrowserContext* RenderViewHostTestHarness::CreateBrowserContext() {
   return new TestBrowserContext();
 }
 
 void RenderViewHostTestHarness::SetRenderProcessHostFactory(
     RenderProcessHostFactory* factory) {
   rvh_test_enabler_.rvh_factory_->set_render_process_host_factory(factory);
 }
 
 }  // namespace content