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

chrome/browser/ui/intents/web_intent_picker_controller.cc

Index: chrome/browser/ui/intents/web_intent_picker_controller.cc
===================================================================
--- chrome/browser/ui/intents/web_intent_picker_controller.cc	(revision 115228)
+++ chrome/browser/ui/intents/web_intent_picker_controller.cc	(working copy)
@@ -116,7 +116,7 @@
           picker_(NULL),
           pending_async_count_(0),
           service_tab_(NULL) {
-  NavigationController* controller = &wrapper->tab_contents()->controller();
+  NavigationController* controller = &wrapper->tab_contents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_LOAD_START,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING,
@@ -213,7 +213,7 @@
   if (service_tab_) {
     int index = TabStripModel::kNoTab;
     Browser* browser = Browser::GetBrowserForController(
-        &service_tab_->controller(), &index);
+        &service_tab_->GetController(), &index);
     if (browser) {
       browser->tabstrip_model()->CloseTabContentsAt(
           index, TabStripModel::CLOSE_CREATE_HISTORICAL_TAB);