Unify desktop and Android tab helper instantiation.

chrome/browser/android/tab_android.cc

Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 73e61c0d53e428ac443049417305d74b6e7c7585..03a5f63d7b88afc247c494e3873887371bfd2a31 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -6,122 +6,31 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/debug/trace_event.h"
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
-#include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
-#include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/history/history_tab_helper.h"
-#include "chrome/browser/infobars/infobar_service.h"
-#include "chrome/browser/net/net_error_tab_helper.h"
-#include "chrome/browser/password_manager/password_manager.h"
-#include "chrome/browser/password_manager/password_manager_delegate_impl.h"
-#include "chrome/browser/prerender/prerender_tab_helper.h"
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
-#include "chrome/browser/ssl/ssl_tab_helper.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
-#include "chrome/browser/tab_contents/navigation_metrics_recorder.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
-#include "chrome/browser/ui/alternate_error_tab_observer.h"
 #include "chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h"
 #include "chrome/browser/ui/android/context_menu_helper.h"
 #include "chrome/browser/ui/android/infobars/infobar_container_android.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "chrome/browser/ui/android/window_android_helper.h"
-#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h"
-#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
-#include "chrome/browser/ui/browser_tab_contents.h"
-#include "chrome/browser/ui/find_bar/find_tab_helper.h"
-#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
+#include "chrome/browser/ui/tab_helpers.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
-#include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
-#include "extensions/browser/view_type_utils.h"
 #include "jni/TabBase_jni.h"
 
-#if defined(ENABLE_MANAGED_USERS)
-#include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
-#endif
-
-namespace {
-
-const char kTabHelpersInitializedUserDataKey[] =
-    "TabAndroidTabHelpersInitialized";
-
-}  // namespace
-
-void BrowserTabContents::AttachTabHelpers(content::WebContents* contents) {
-  // If already initialized, nothing to be done.
-  base::SupportsUserData::Data* initialization_tag =
-      contents->GetUserData(&kTabHelpersInitializedUserDataKey);
-  if (initialization_tag)
-    return;
-
-  // Mark as initialized.
-  contents->SetUserData(&kTabHelpersInitializedUserDataKey,
-                            new base::SupportsUserData::Data());
-
-  // Set the view type.
-  extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS);
-
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
-
-  // SessionTabHelper comes first because it sets up the tab ID, and other
-  // helpers may rely on that.
-  SessionTabHelper::CreateForWebContents(contents);
-
-  AlternateErrorPageTabObserver::CreateForWebContents(contents);
-  autofill::TabAutofillManagerDelegate::CreateForWebContents(contents);
-  autofill::AutofillDriverImpl::CreateForWebContentsAndDelegate(
-      contents,
-      autofill::TabAutofillManagerDelegate::FromWebContents(contents),
-      g_browser_process->GetApplicationLocale(),
-      autofill::AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
-  BookmarkTabHelper::CreateForWebContents(contents);
-  ContextMenuHelper::CreateForWebContents(contents);
-  CoreTabHelper::CreateForWebContents(contents);
-  extensions::TabHelper::CreateForWebContents(contents);
-  FaviconTabHelper::CreateForWebContents(contents);
-  FindTabHelper::CreateForWebContents(contents);
-  HistoryTabHelper::CreateForWebContents(contents);
-  InfoBarService::CreateForWebContents(contents);
-  NavigationMetricsRecorder::CreateForWebContents(contents);
-  chrome_browser_net::NetErrorTabHelper::CreateForWebContents(contents);
-  PasswordManagerDelegateImpl::CreateForWebContents(contents);
-  PasswordManager::CreateForWebContentsAndDelegate(
-      contents, PasswordManagerDelegateImpl::FromWebContents(contents));
-  PopupBlockerTabHelper::CreateForWebContents(contents);
-  PrefsTabHelper::CreateForWebContents(contents);
-  prerender::PrerenderTabHelper::CreateForWebContentsWithPasswordManager(
-      contents, PasswordManager::FromWebContents(contents));
-  SingleTabModeTabHelper::CreateForWebContents(contents);
-  SSLTabHelper::CreateForWebContents(contents);
-  TabSpecificContentSettings::CreateForWebContents(contents);
-  TranslateTabHelper::CreateForWebContents(contents);
-  WindowAndroidHelper::CreateForWebContents(contents);
-
-#if defined(ENABLE_MANAGED_USERS)
-  if (profile->IsManaged())
-    ManagedModeNavigationObserver::CreateForWebContents(contents);
-#endif
-}
-
-// TODO(dtrainor): Refactor so we do not need this method.
-void TabAndroid::InitTabHelpers(content::WebContents* contents) {
-  BrowserTabContents::AttachTabHelpers(contents);
-}
-
 TabAndroid* TabAndroid::FromWebContents(content::WebContents* web_contents) {
   CoreTabHelper* core_tab_helper = CoreTabHelper::FromWebContents(web_contents);
   if (!core_tab_helper)
@@ -331,7 +240,7 @@ void TabAndroid::InitWebContents(JNIEnv* env,
   DCHECK(content_view_core->GetWebContents());
 
   web_contents_.reset(content_view_core->GetWebContents());
-  InitTabHelpers(web_contents_.get());
+  TabHelpers::AttachTabHelpers(web_contents_.get());
 
   session_tab_id_.set_id(
       SessionTabHelper::FromWebContents(web_contents())->session_id().id());