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

chrome/browser/ui/webui/web_ui_unittest.cc

Index: chrome/browser/ui/webui/web_ui_unittest.cc
===================================================================
--- chrome/browser/ui/webui/web_ui_unittest.cc	(revision 115228)
+++ chrome/browser/ui/webui/web_ui_unittest.cc	(working copy)
@@ -26,7 +26,7 @@
   // values. This must be increasing for the life of the tests.
   static void DoNavigationTest(TabContentsWrapper* wrapper, int page_id) {
     TabContents* contents = wrapper->tab_contents();
-    NavigationController* controller = &contents->controller();
+    NavigationController* controller = &contents->GetController();
 
     // Start a pending load.
     GURL new_tab_url(chrome::kChromeUINewTabURL);
@@ -169,7 +169,7 @@
   TabContentsForFocusTest* tc = new TabContentsForFocusTest(
       contents()->browser_context(),
       SiteInstance::CreateSiteInstance(contents()->browser_context()));
-  tc->controller().CopyStateFrom(controller());
+  tc->GetController().CopyStateFrom(controller());
   SetContents(tc);
   int page_id = 200;