Revert 115346. The change didn't break anything, the test was faulty. Will disable in a followup. - Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests

on win,linux,mac.

Original change: Rename TabContents::controller() to GetController and put it into the WebContents namespace.

BUG=98716
TBR=dpranke
Review URL: http://codereview.chromium.org/8956050

TBR=jam

Review URL: http://codereview.chromium.org/9018016

TBR=thakis@chromium.org

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115428 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 18 deletions

diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 02aa238..82963a5 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -87,31 +87,15 @@ class CONTENT_EXPORT TabContents : public content::WebContents,
 
   // Intrinsic tab state -------------------------------------------------------
 
-  // Gets the controller for this tab contents.
-  NavigationController& controller() { return controller_; }
-  const NavigationController& controller() const { return controller_; }
-
   // Returns the user browser context associated with this TabContents (via the
   // NavigationController).
   content::BrowserContext* browser_context() const {
     return controller_.browser_context();
   }
 
-  // Allows overriding the type of this tab.
-  void set_view_type(content::ViewType type) { view_type_ = type; }
-
   // Returns the SavePackage which manages the page saving job. May be NULL.
   SavePackage* save_package() const { return save_package_.get(); }
 
-  // Return the currently active RenderProcessHost and RenderViewHost. Each of
-  // these may change over time.
-  content::RenderProcessHost* GetRenderProcessHost() const;
-
-
-
-
-
-
   WebUI* committed_web_ui() const {
     return render_manager_.web_ui();
   }
@@ -469,8 +453,11 @@ class CONTENT_EXPORT TabContents : public content::WebContents,
   virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
   virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
   virtual void SetDelegate(content::WebContentsDelegate* delegate) OVERRIDE;
-
-
+  virtual NavigationController& GetController() OVERRIDE;
+  virtual const NavigationController& GetController() const OVERRIDE;
+  // TODO(jam): browser_context getters go here
+  virtual void SetViewType(content::ViewType type) OVERRIDE;
+  virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
   virtual RenderViewHost* GetRenderViewHost() const OVERRIDE;
   // TODO(jam): webui stuff goes here
   virtual RenderWidgetHostView* GetRenderWidgetHostView() const OVERRIDE;