Create CoreTabHelper, move remaining core TCW functionality into it.

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 0a5413b2d48f34260a265a82d62599ab571453db..8c0e8b8bebe23757bb86b29c2761665167e0994f 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -40,7 +40,7 @@
 #include "chrome/browser/ui/fullscreen_exit_bubble_type.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/browser/ui/select_file_dialog.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
+#include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
@@ -76,7 +76,7 @@ class Point;
 
 class Browser : public TabHandlerDelegate,
                 public TabContentsDelegate,
-                public TabContentsWrapperDelegate,
+                public CoreTabHelperDelegate,
                 public SearchEngineTabHelperDelegate,
                 public ConstrainedWindowTabHelperDelegate,
                 public BlockedContentTabHelperDelegate,
@@ -1023,7 +1023,7 @@ class Browser : public TabHandlerDelegate,
   virtual void RequestToLockMouse(TabContents* tab) OVERRIDE;
   virtual void LostMouseLock() OVERRIDE;
 
-  // Overridden from TabContentsWrapperDelegate:
+  // Overridden from CoreTabHelperDelegate:
   // Note that the caller is responsible for deleting |old_tab_contents|.
   virtual void SwapTabContents(TabContentsWrapper* old_tab_contents,
                                TabContentsWrapper* new_tab_contents) OVERRIDE;