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

chrome/browser/tabs/tab_strip_model_unittest.cc

Index: chrome/browser/tabs/tab_strip_model_unittest.cc
===================================================================
--- chrome/browser/tabs/tab_strip_model_unittest.cc	(revision 115228)
+++ chrome/browser/tabs/tab_strip_model_unittest.cc	(working copy)
@@ -584,9 +584,9 @@
     EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(contents2));
     EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1));
     EXPECT_EQ(0, tabstrip.GetIndexOfController(
-                     &contents2->tab_contents()->controller()));
+                     &contents2->tab_contents()->GetController()));
     EXPECT_EQ(1, tabstrip.GetIndexOfController(
-                     &contents1->tab_contents()->controller()));
+                     &contents1->tab_contents()->GetController()));
   }
 
   // Test UpdateTabContentsStateAt
@@ -639,7 +639,8 @@
   // background with opener_contents set as their opener.
 
   TabContentsWrapper* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->tab_contents()->controller();
+  NavigationController* opener =
+      &opener_contents->tab_contents()->GetController();
   tabstrip.AppendTabContents(opener_contents, true);
   TabContentsWrapper* contents1 = CreateTabContents();
   TabContentsWrapper* contents2 = CreateTabContents();
@@ -677,7 +678,7 @@
 
   // For a tab that has opened no other tabs, the return value should always be
   // -1...
-  NavigationController* o1 = &contents1->tab_contents()->controller();
+  NavigationController* o1 = &contents1->tab_contents()->GetController();
   EXPECT_EQ(-1, tabstrip.GetIndexOfNextTabContentsOpenedBy(o1, 3, false));
   EXPECT_EQ(-1, tabstrip.GetIndexOfLastTabContentsOpenedBy(o1, 3));
 
@@ -790,7 +791,8 @@
   EXPECT_TRUE(tabstrip.empty());
 
   TabContentsWrapper* opener_contents = CreateTabContents();
-  NavigationController* opener = &opener_contents->tab_contents()->controller();
+  NavigationController* opener =
+      &opener_contents->tab_contents()->GetController();
   tabstrip.AppendTabContents(opener_contents, true);
 
   // Open some other random unrelated tab in the background to monkey with our