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

content/browser/tab_contents/test_tab_contents.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/tab_contents/test_tab_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/renderer_host/mock_render_process_host.h"
@@ skipping 68 matching lines @@
     RenderViewHost* render_view_host) {
   // This will go to a TestRenderViewHost.
   render_view_host->CreateRenderView(string16(), -1);
   return true;
 }
 
 TabContents* TestTabContents::Clone() {
   TabContents* tc = new TestTabContents(
       GetBrowserContext(),
       SiteInstance::CreateSiteInstance(GetBrowserContext()));
-  tc->GetController().CopyStateFrom(controller_);
+  tc->GetControllerImpl().CopyStateFrom(controller_);
   return tc;
 }
 
 void TestTabContents::NavigateAndCommit(const GURL& url) {
   GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
   BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &loaded_url, GetBrowserContext(), &reverse_on_redirect);
@@ skipping 54 matching lines @@
 
 void TestTabContents::SetHistoryLengthAndPrune(
     const SiteInstance* site_instance, int history_length, int32 min_page_id) {
   EXPECT_TRUE(expect_set_history_length_and_prune_);
   expect_set_history_length_and_prune_ = false;
   EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance);
   EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
             history_length);
   EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
 }