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

chrome/browser/ui/web_applications/web_app_ui.cc

Index: chrome/browser/ui/web_applications/web_app_ui.cc
===================================================================
--- chrome/browser/ui/web_applications/web_app_ui.cc	(revision 115228)
+++ chrome/browser/ui/web_applications/web_app_ui.cc	(working copy)
@@ -104,7 +104,7 @@
       this,
       content::NOTIFICATION_TAB_CLOSING,
       content::Source<NavigationController>(
-          &tab_contents_->tab_contents()->controller()));
+          &tab_contents_->tab_contents()->GetController()));
 }
 
 void UpdateShortcutWorker::Run() {
@@ -118,7 +118,7 @@
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_TAB_CLOSING &&
       content::Source<NavigationController>(source).ptr() ==
-        &tab_contents_->tab_contents()->controller()) {
+        &tab_contents_->tab_contents()->GetController()) {
     // Underlying tab is closing.
     tab_contents_ = NULL;
   }