Revert of Add support for ContentViewCore helpers on Tab

chrome/browser/android/tab_android.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 #define CHROME_BROWSER_ANDROID_TAB_ANDROID_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback_forward.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/favicon/favicon_tab_helper_observer.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/sync/glue/synced_tab_delegate_android.h"
 #include "chrome/browser/ui/search/search_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "components/sessions/session_id.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class GURL;
 class Profile;
 class SkBitmap;
 
-namespace cc {
-class Layer;
-}
-
 namespace chrome {
 struct NavigateParams;
 }
 
 namespace chrome {
 namespace android {
 class ChromeWebContentsDelegateAndroid;
-class TabContentManager;
 }
 }
 
 namespace content {
 class ContentViewCore;
 class WebContents;
 }
 
 namespace prerender {
 class PrerenderManager;
@@ skipping 26 matching lines @@
   static void AttachTabHelpers(content::WebContents* web_contents);
 
   TabAndroid(JNIEnv* env, jobject obj);
   ~TabAndroid() override;
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
 
   // Return the WebContents, if any, currently owned by this TabAndroid.
   content::WebContents* web_contents() const { return web_contents_.get(); }
 
-  // Return the cc::Layer that represents the content for this TabAndroid.
-  scoped_refptr<cc::Layer> GetContentLayer() const;
-
   // Return specific id information regarding this TabAndroid.
   const SessionID& session_id() const { return session_tab_id_; }
   int GetAndroidId() const;
   int GetSyncId() const;
 
   // Return the tab title.
   base::string16 GetTitle() const;
 
   // Return the tab url.
   GURL GetURL() const;
@@ skipping 88 matching lines @@
                               jint constraints,
                               jint current,
                               jboolean animate);
 
   void SearchByImageInNewTabAsync(JNIEnv* env, jobject obj);
 
   void SetInterceptNavigationDelegate(JNIEnv* env,
                                       jobject obj,
                                       jobject delegate);
 
-  // TODO(dtrainor): Remove this, pull content_layer() on demand.
-  void AttachToTabContentManager(JNIEnv* env,
-                                 jobject obj,
-                                 jobject jtab_content_manager);
-
-  void AttachOverlayContentViewCore(JNIEnv* env,
-                                    jobject obj,
-                                    jobject jcontent_view_core,
-                                    jboolean visible);
-
-  void DetachOverlayContentViewCore(JNIEnv* env,
-                                    jobject obj,
-                                    jobject jcontent_view_core);
-
   // Register the Tab's native methods through JNI.
   static bool RegisterTabAndroid(JNIEnv* env);
 
  private:
   prerender::PrerenderManager* GetPrerenderManager() const;
 
   JavaObjectWeakGlobalRef weak_java_tab_;
 
   // The identifier used by session restore for this tab.
   SessionID session_tab_id_;
 
   // Identifier of the window the tab is in.
   SessionID session_window_id_;
 
   content::NotificationRegistrar notification_registrar_;
 
-  scoped_refptr<cc::Layer> content_layer_;
-  chrome::android::TabContentManager* tab_content_manager_;
-
   scoped_ptr<content::WebContents> web_contents_;
   scoped_ptr<chrome::android::ChromeWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   scoped_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_