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

content/browser/tab_contents/test_tab_contents.cc

Index: content/browser/tab_contents/test_tab_contents.cc
===================================================================
--- content/browser/tab_contents/test_tab_contents.cc	(revision 115228)
+++ content/browser/tab_contents/test_tab_contents.cc	(working copy)
@@ -82,12 +82,12 @@
 TabContents* TestTabContents::Clone() {
   TabContents* tc = new TestTabContents(
       browser_context(), SiteInstance::CreateSiteInstance(browser_context()));
-  tc->controller().CopyStateFrom(controller_);
+  tc->GetController().CopyStateFrom(controller_);
   return tc;
 }
 
 void TestTabContents::NavigateAndCommit(const GURL& url) {
-  controller().LoadURL(
+  GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
   GURL loaded_url(url);
   bool reverse_on_redirect = false;
@@ -109,7 +109,7 @@
   if (!rvh)
     rvh = static_cast<TestRenderViewHost*>(old_rvh);
 
-  const NavigationEntry* entry = controller().pending_entry();
+  const NavigationEntry* entry = GetController().pending_entry();
   DCHECK(entry);
   int page_id = entry->page_id();
   if (page_id == -1) {