Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

content/browser/renderer_host/test_render_view_host.cc

 
 // Copyright (c) 2011 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/browser_url_handler.h"
 #include "content/browser/renderer_host/test_backing_store.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
@@ skipping 293 matching lines @@
 RenderViewHostTestHarness::RenderViewHostTestHarness()
     : rph_factory_(),
       rvh_factory_(&rph_factory_),
       contents_(NULL) {
 }
 
 RenderViewHostTestHarness::~RenderViewHostTestHarness() {
 }
 
 NavigationController& RenderViewHostTestHarness::controller() {
-  return contents()->GetController();
+  return contents()->GetControllerImpl();
 }
 
 TestTabContents* RenderViewHostTestHarness::contents() {
   return contents_.get();
 }
 
 TestRenderViewHost* RenderViewHostTestHarness::rvh() {
   return static_cast<TestRenderViewHost*>(contents()->GetRenderViewHost());
 }
 
@@ skipping 55 matching lines @@
   SetContents(NULL);
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
 }