Create CoreTabHelper, move remaining core TCW functionality into it.

chrome/browser/ui/tab_contents/tab_contents_wrapper.h

Index: chrome/browser/ui/tab_contents/tab_contents_wrapper.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
index a17c10de4cda9c70a68e96885b8ef9025b46935f..5d34b2641c1a7be3965470efab9f7598d581f9b1 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h
@@ -25,6 +25,7 @@ class AutomationTabHelper;
 class BlockedContentTabHelper;
 class BookmarkTabHelper;
 class ConstrainedWindowTabHelper;
+class CoreTabHelper;
 class DownloadRequestLimiterObserver;
 class ExtensionTabHelper;
 class ExtensionWebNavigationTabObserver;
@@ -44,7 +45,6 @@ class RestoreTabHelper;
 class SadTabObserver;
 class SearchEngineTabHelper;
 class TabContentsSSLHelper;
-class TabContentsWrapperDelegate;
 class TabContentsWrapperSyncedTabDelegate;
 class TabSpecificContentSettings;
 class ThumbnailGenerator;
@@ -86,24 +86,10 @@ class TabContentsWrapper : public TabContentsObserver,
   // its property bag to avoid adding additional interfaces.
   static base::PropertyAccessor<TabContentsWrapper*>* property_accessor();
 
-  static void RegisterUserPrefs(PrefService* prefs);
-
-  // Initial title assigned to NavigationEntries from Navigate.
-  static string16 GetDefaultTitle();
-
-  // Returns a human-readable description the tab's loading state.
-  string16 GetStatusText() const;
-
   // Create a TabContentsWrapper with the same state as this one. The returned
   // heap-allocated pointer is owned by the caller.
   TabContentsWrapper* Clone();
 
-  // Captures a snapshot of the page.
-  void CaptureSnapshot();
-
-  // Stop this tab rendering in fullscreen mode.
-  void ExitFullscreenMode();
-
   // Helper to retrieve the existing instance that wraps a given TabContents.
   // Returns NULL if there is no such existing instance.
   // NOTE: This is not intended for general use. It is intended for situations
@@ -115,9 +101,6 @@ class TabContentsWrapper : public TabContentsObserver,
   static const TabContentsWrapper* GetCurrentWrapperForContents(
       const TabContents* contents);
 
-  TabContentsWrapperDelegate* delegate() const { return delegate_; }
-  void set_delegate(TabContentsWrapperDelegate* d) { delegate_ = d; }
-
   TabContents* tab_contents() const { return tab_contents_.get(); }
   NavigationController& controller() const {
     return tab_contents()->controller();
@@ -155,6 +138,8 @@ class TabContentsWrapper : public TabContentsObserver,
     return constrained_window_tab_helper_.get();
   }
 
+  CoreTabHelper* core_tab_helper() { return core_tab_helper_.get(); }
+
   ExtensionTabHelper* extension_tab_helper() {
     return extension_tab_helper_.get();
   }
@@ -215,9 +200,6 @@ class TabContentsWrapper : public TabContentsObserver,
   // Overrides -----------------------------------------------------------------
 
   // TabContentsObserver overrides:
-  virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
-  virtual void DidBecomeSelected() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void TabContentsDestroyed(TabContents* tab) OVERRIDE;
 
   // content::NotificationObserver overrides:
@@ -231,26 +213,12 @@ class TabContentsWrapper : public TabContentsObserver,
 
   // Internal helpers ----------------------------------------------------------
 
-  // Message handlers.
-  void OnSnapshot(const SkBitmap& bitmap);
-  void OnPDFHasUnsupportedFeature();
-
-  // Returns the server that can provide alternate error pages.  If the returned
-  // URL is empty, the default error page built into WebKit will be used.
-  GURL GetAlternateErrorPageURL() const;
-
-  // Send the alternate error page URL to the renderer.
-  void UpdateAlternateErrorPageURL(RenderViewHost* rvh);
-
   // Create or destroy SafebrowsingDetectionHost as needed if the user's
   // safe browsing preference has changed.
   void UpdateSafebrowsingDetectionHost();
 
   // Data for core operation ---------------------------------------------------
 
-  // Delegate for notifying our owner about stuff. Not owned by us.
-  TabContentsWrapperDelegate* delegate_;
-
   content::NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
 
@@ -271,6 +239,7 @@ class TabContentsWrapper : public TabContentsObserver,
   scoped_ptr<BlockedContentTabHelper> blocked_content_tab_helper_;
   scoped_ptr<BookmarkTabHelper> bookmark_tab_helper_;
   scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
+  scoped_ptr<CoreTabHelper> core_tab_helper_;
   scoped_ptr<ExtensionTabHelper> extension_tab_helper_;
   scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<FindTabHelper> find_tab_helper_;