Android: Remove ContentViewCore::GetLayer() from public interface

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 <stdint.h>
 
@@ skipping 27 matching lines @@
 }
 
 namespace chrome {
 namespace android {
 class TabWebContentsDelegateAndroid;
 class TabContentManager;
 }
 }
 
 namespace content {
-class ContentViewCore;
 class WebContents;
 }
 
 namespace infobars {
 class InfoBar;
 }
 
 namespace prerender {
 class PrerenderManager;
 }
@@ skipping 46 matching lines @@
   base::string16 GetTitle() const;
 
   // Return the tab url.
   GURL GetURL() const;
 
   // Load the tab if it was unloaded from memory.
   bool LoadIfNeeded();
 
   // Helper methods to make it easier to access objects from the associated
   // WebContents.  Can return NULL.
-  content::ContentViewCore* GetContentViewCore() const;
   Profile* GetProfile() const;
   browser_sync::SyncedTabDelegate* GetSyncedTabDelegate() const;
 
   void SetWindowSessionID(SessionID::id_type window_id);
   void SetSyncId(int sync_id);
 
   void HandlePopupNavigation(chrome::NavigateParams* params);
 
   bool HasPrerenderedUrl(GURL gurl);
 
@@ skipping 31 matching lines @@
                         bool icon_url_changed,
                         const gfx::Image& image) override;
 
   // Methods called from Java via JNI -----------------------------------------
 
   void Destroy(JNIEnv* env, const base::android::JavaParamRef<jobject>& obj);
   void InitWebContents(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jboolean incognito,
-      const base::android::JavaParamRef<jobject>& jcontent_view_core,
+      const base::android::JavaParamRef<jobject>& jweb_contents,
       const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
       const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
   void UpdateDelegates(
         JNIEnv* env,
         const base::android::JavaParamRef<jobject>& obj,
         const base::android::JavaParamRef<jobject>& jweb_contents_delegate,
         const base::android::JavaParamRef<jobject>& jcontext_menu_populator);
   void DestroyWebContents(JNIEnv* env,
                           const base::android::JavaParamRef<jobject>& obj,
                           jboolean delete_native);
@@ skipping 62 matching lines @@
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& delegate);
 
   // TODO(dtrainor): Remove this, pull content_layer() on demand.
   void AttachToTabContentManager(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       const base::android::JavaParamRef<jobject>& jtab_content_manager);
 
-  void AttachOverlayContentViewCore(
+  void AttachOverlayWebContents(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jobject>& jcontent_view_core,
+      const base::android::JavaParamRef<jobject>& jweb_contents,
       jboolean visible);
 
-  void DetachOverlayContentViewCore(
+  void DetachOverlayWebContents(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      const base::android::JavaParamRef<jobject>& jcontent_view_core);
+      const base::android::JavaParamRef<jobject>& jweb_contents);
 
   bool HasPrerenderedUrl(JNIEnv* env,
                          const base::android::JavaParamRef<jobject>& obj,
                          const base::android::JavaParamRef<jstring>& url);
 
   // Register the Tab's native methods through JNI.
   static bool RegisterTabAndroid(JNIEnv* env);
 
  private:
   prerender::PrerenderManager* GetPrerenderManager() const;
@@ skipping 14 matching lines @@
   std::unique_ptr<content::WebContents> web_contents_;
   std::unique_ptr<chrome::android::TabWebContentsDelegateAndroid>
       web_contents_delegate_;
 
   std::unique_ptr<browser_sync::SyncedTabDelegateAndroid> synced_tab_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TabAndroid);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_TAB_ANDROID_H_