| Index: chrome/browser/prerender/prerender_manager.cc
|
| diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
|
| index 52ef74a03a468b591a51e80fdd7ec5e954f43107..c2130928d3c27e23801c8b4340dbcab589dcb5f5 100644
|
| --- a/chrome/browser/prerender/prerender_manager.cc
|
| +++ b/chrome/browser/prerender/prerender_manager.cc
|
| @@ -663,8 +663,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents,
|
| MarkTabContentsAsPrerendered(new_tab_contents->tab_contents());
|
|
|
| // Merge the browsing history.
|
| - new_tab_contents->tab_contents()->GetController().CopyStateFromAndPrune(
|
| - &old_tab_contents->tab_contents()->GetController());
|
| + new_tab_contents->tab_contents()->controller().CopyStateFromAndPrune(
|
| + &old_tab_contents->tab_contents()->controller());
|
| old_tab_contents->core_tab_helper()->delegate()->
|
| SwapTabContents(old_tab_contents, new_tab_contents);
|
| prerender_contents->CommitHistory(new_tab_contents);
|
|
|