Rename TabContents::controller() to GetController and put it into the WebContents interface.

chrome/browser/prerender/prerender_manager.cc

Index: chrome/browser/prerender/prerender_manager.cc
===================================================================
--- chrome/browser/prerender/prerender_manager.cc	(revision 115228)
+++ chrome/browser/prerender/prerender_manager.cc	(working copy)
@@ -663,8 +663,8 @@
   MarkTabContentsAsPrerendered(new_tab_contents->tab_contents());
 
   // Merge the browsing history.
-  new_tab_contents->tab_contents()->controller().CopyStateFromAndPrune(
-      &old_tab_contents->tab_contents()->controller());
+  new_tab_contents->tab_contents()->GetController().CopyStateFromAndPrune(
+      &old_tab_contents->tab_contents()->GetController());
   old_tab_contents->core_tab_helper()->delegate()->
       SwapTabContents(old_tab_contents, new_tab_contents);
   prerender_contents->CommitHistory(new_tab_contents);