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

content/browser/tab_contents/tab_contents.cc

Index: content/browser/tab_contents/tab_contents.cc
===================================================================
--- content/browser/tab_contents/tab_contents.cc	(revision 115228)
+++ content/browser/tab_contents/tab_contents.cc	(working copy)
@@ -330,6 +330,18 @@
   delegate_->RunFileChooser(this, params);
 }
 
+NavigationController& TabContents::GetController() {
+  return controller_;
+}
+
+const NavigationController& TabContents::GetController() const {
+  return controller_;
+}
+
+void TabContents::SetViewType(content::ViewType type) {
+  view_type_ = type;
+}
+
 content::RenderProcessHost* TabContents::GetRenderProcessHost() const {
   if (render_manager_.current_host())
     return render_manager_.current_host()->process();
@@ -691,7 +703,7 @@
       browser_context(),
       SiteInstance::CreateSiteInstance(browser_context()),
       MSG_ROUTING_NONE, this, NULL);
-  tc->controller().CopyStateFrom(controller_);
+  tc->GetController().CopyStateFrom(controller_);
   return tc;
 }
 
@@ -858,7 +870,7 @@
         GetRenderProcessHost()->GetID(), GetRenderViewHost()->routing_id());
   } else {
     GURL url;
-    NavigationEntry* active_entry = controller().GetActiveEntry();
+    NavigationEntry* active_entry = GetController().GetActiveEntry();
     // Since zoom map is updated using rewritten URL, use rewritten URL
     // to get the zoom level.
     url = active_entry ? active_entry->url() : GURL::EmptyGURL();
@@ -883,7 +895,7 @@
   if (!delegate_)
     return;
 
-  NavigationEntry* active_entry = controller().GetActiveEntry();
+  NavigationEntry* active_entry = GetController().GetActiveEntry();
   if (!active_entry)
     return;
 
@@ -1068,7 +1080,7 @@
 void TabContents::OnDidDisplayInsecureContent() {
   content::RecordAction(UserMetricsAction("SSL.DisplayedInsecureContent"));
   displayed_insecure_content_ = true;
-  SSLManager::NotifySSLInternalStateChanged(&controller());
+  SSLManager::NotifySSLInternalStateChanged(&GetController());
 }
 
 void TabContents::OnDidRunInsecureContent(
@@ -1082,7 +1094,7 @@
   }
   controller_.ssl_manager()->DidRunInsecureContent(security_origin);
   displayed_insecure_content_ = true;
-  SSLManager::NotifySSLInternalStateChanged(&controller());
+  SSLManager::NotifySSLInternalStateChanged(&GetController());
 }
 
 void TabContents::OnDocumentLoadedInFrame(int64 frame_id) {
@@ -2004,7 +2016,7 @@
 }
 
 NavigationController& TabContents::GetControllerForRenderManager() {
-  return controller();
+  return GetController();
 }
 
 WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) {