Unify desktop and Android tab helper instantiation.

chrome/browser/ui/tab_helpers.h

Index: chrome/browser/ui/tab_helpers.h
diff --git a/chrome/browser/ui/browser_tab_contents.h b/chrome/browser/ui/tab_helpers.h
similarity index 77%
rename from chrome/browser/ui/browser_tab_contents.h
rename to chrome/browser/ui/tab_helpers.h
index 7ca05788a874368ac1dcd453398d708b3d08beec..1c678f2b55a08b530b7c09e7db86c4f0b2ee0b15 100644
--- a/chrome/browser/ui/browser_tab_contents.h
+++ b/chrome/browser/ui/tab_helpers.h
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_BROWSER_TAB_CONTENTS_H_
-#define CHROME_BROWSER_UI_BROWSER_TAB_CONTENTS_H_
-
-class Browser;
+#ifndef CHROME_BROWSER_UI_TAB_HELPERS_H_
+#define CHROME_BROWSER_UI_TAB_HELPERS_H_
 
 namespace content {
 class WebContents;
@@ -13,29 +11,35 @@ class WebContents;
 
 namespace chrome {
 class BrowserTabStripModelDelegate;
+
+namespace android {
+class ChromeWebContentsDelegateAndroid;
+}
 }
 
 namespace prerender {
 class PrerenderContents;
 }
 
-// A "tab contents" is a WebContents that is used as a tab in a browser
-// window, and thus is owned by a Browser's TabStripModel. The
-// BrowserTabContents class allows specific classes to attach the set of tab
-// helpers that is used for tab contents.
+// A "tab contents" is a WebContents that is used as a tab in a browser window
+// (or the equivalent on Android). The TabHelpers class allows specific classes
+// to attach the set of tab helpers that is used for tab contents.
 //
 // TODO(avi): This list is rather large, and for most callers it's due to the
 // fact that they need tab helpers attached early to deal with arbitrary
 // content loaded into a WebContents that will later be added to the tabstrip.
 // Is there a better way to handle this? (Ideally, this list would contain
 // only Browser and BrowserTabStripModelDelegate.)
-class BrowserTabContents {
+class TabHelpers {
  private:
   // Browser and its TabStripModelDelegate have intimate control of tabs.
   // TabAndroid is the equivalent on Android.
   friend class Browser;
   friend class chrome::BrowserTabStripModelDelegate;
+
+  // These are the Android equivalents of the two classes above.
   friend class TabAndroid;
+  friend class chrome::android::ChromeWebContentsDelegateAndroid;
 
   // chrome::Navigate creates WebContents that are destined for the tab strip,
   // and that might have WebUI that immediately calls back into random tab
@@ -53,4 +57,4 @@ class BrowserTabContents {
   static void AttachTabHelpers(content::WebContents* web_contents);
 };
 
-#endif  // CHROME_BROWSER_UI_BROWSER_TAB_CONTENTS_H_
+#endif  // CHROME_BROWSER_UI_TAB_HELPERS_H_