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

chrome/browser/ui/bookmarks/bookmark_tab_helper.cc

Index: chrome/browser/ui/bookmarks/bookmark_tab_helper.cc
===================================================================
--- chrome/browser/ui/bookmarks/bookmark_tab_helper.cc	(revision 115228)
+++ chrome/browser/ui/bookmarks/bookmark_tab_helper.cc	(working copy)
@@ -49,7 +49,7 @@
   // is very similar, but for non-first loads, we want to use the committed
   // entry. This is so the bookmarks bar disappears at the same time the page
   // does.
-  if (tab_contents()->controller().GetLastCommittedEntry()) {
+  if (tab_contents()->GetController().GetLastCommittedEntry()) {
     // Not the first load, always use the committed Web UI.
     return CanShowBookmarkBar(tab_contents()->committed_web_ui());
   }