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

chrome/browser/external_tab_container_win.cc

Index: chrome/browser/external_tab_container_win.cc
===================================================================
--- chrome/browser/external_tab_container_win.cc	(revision 115228)
+++ chrome/browser/external_tab_container_win.cc	(working copy)
@@ -170,7 +170,7 @@
 
   if (existing_contents) {
     tab_contents_.reset(existing_contents);
-    tab_contents_->tab_contents()->controller().set_browser_context(profile);
+    tab_contents_->tab_contents()->GetController().set_browser_context(profile);
   } else {
     TabContents* new_contents = new TabContents(profile, NULL, MSG_ROUTING_NONE,
                                                 NULL, NULL);
@@ -192,7 +192,7 @@
   }
 
   NavigationController* controller =
-      &tab_contents_->tab_contents()->controller();
+      &tab_contents_->tab_contents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
@@ -249,7 +249,7 @@
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_EXTERNAL_TAB_CLOSED,
         content::Source<NavigationController>(
-            &tab_contents_->tab_contents()->controller()),
+            &tab_contents_->tab_contents()->GetController()),
         content::Details<ExternalTabContainer>(this));
 
     tab_contents_.reset(NULL);
@@ -826,7 +826,7 @@
         if (InitNavigationInfo(&navigation_info, commit->type,
                 commit->previous_entry_index -
                 tab_contents_->tab_contents()->
-                    controller().last_committed_entry_index()))
+                    GetController().last_committed_entry_index()))
           automation_->Send(new AutomationMsg_DidNavigate(tab_handle_,
                                                           navigation_info));
       }
@@ -948,7 +948,7 @@
                                               int relative_offset) {
   DCHECK(nav_info);
   NavigationEntry* entry =
-      tab_contents_->tab_contents()->controller().GetActiveEntry();
+      tab_contents_->tab_contents()->GetController().GetActiveEntry();
   // If this is very early in the game then we may not have an entry.
   if (!entry)
     return false;
@@ -956,7 +956,7 @@
   nav_info->navigation_type = nav_type;
   nav_info->relative_offset = relative_offset;
   nav_info->navigation_index =
-      tab_contents_->tab_contents()->controller().GetCurrentEntryIndex();
+      tab_contents_->tab_contents()->GetController().GetCurrentEntryIndex();
   nav_info->url = entry->url();
   nav_info->referrer = entry->referrer().url;
   nav_info->title =  UTF16ToWideHack(entry->title());
@@ -1052,7 +1052,7 @@
 
   TRACE_EVENT_BEGIN_ETW("ExternalTabContainer::Navigate", 0, url.spec());
 
-  tab_contents_->tab_contents()->controller().LoadURL(
+  tab_contents_->tab_contents()->GetController().LoadURL(
       url, content::Referrer(referrer, WebKit::WebReferrerPolicyDefault),
       content::PAGE_TRANSITION_START_PAGE, std::string());
 }