| Index: chrome/browser/android/tab_android.cc
|
| diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
|
| index 96368a80078d98f1cca9278ce946e9c4df377441..dee16cfcee2dbd9b39726c9a3450de735b8799bc 100644
|
| --- a/chrome/browser/android/tab_android.cc
|
| +++ b/chrome/browser/android/tab_android.cc
|
| @@ -24,7 +24,6 @@
|
| #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/sync/tab_contents_synced_tab_delegate.h"
|
| #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
|
| #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
|
| #include "components/autofill/browser/autofill_external_delegate.h"
|
| @@ -57,10 +56,6 @@ void BrowserTabContents::AttachTabHelpers(WebContents* contents) {
|
| // Set the view type.
|
| extensions::SetViewType(contents, extensions::VIEW_TYPE_TAB_CONTENTS);
|
|
|
| - // 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::AutofillManager::CreateForWebContentsAndDelegate(
|
| @@ -86,7 +81,6 @@ void BrowserTabContents::AttachTabHelpers(WebContents* contents) {
|
| PrefsTabHelper::CreateForWebContents(contents);
|
| prerender::PrerenderTabHelper::CreateForWebContents(contents);
|
| SSLTabHelper::CreateForWebContents(contents);
|
| - TabContentsSyncedTabDelegate::CreateForWebContents(contents);
|
| TabSpecificContentSettings::CreateForWebContents(contents);
|
| TranslateTabHelper::CreateForWebContents(contents);
|
| WindowAndroidHelper::CreateForWebContents(contents);
|
| @@ -103,13 +97,10 @@ WebContents* TabAndroid::InitWebContentsFromView(JNIEnv* env,
|
| DCHECK(content_view_core);
|
| WebContents* web_contents = content_view_core->GetWebContents();
|
| DCHECK(web_contents);
|
| - InitTabHelpers(web_contents);
|
| return web_contents;
|
| }
|
|
|
| -TabAndroid::TabAndroid(JNIEnv* env, jobject obj)
|
| - : tab_id_(-1),
|
| - weak_java_tab_(env, obj) {
|
| +TabAndroid::TabAndroid(JNIEnv* env, jobject obj) : weak_java_tab_(env, obj) {
|
| Java_TabBase_setNativePtr(env, obj, reinterpret_cast<jint>(this));
|
| }
|
|
|
|
|