Migrate the Android compositor to cc::Layer classes.

content/public/browser/android/content_view_core.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 CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 
 #include "base/android/scoped_java_ref.h"
 #include <jni.h>
 
 #include "content/public/browser/navigation_controller.h"
 
+namespace cc {
+class Layer;
+}
+
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 class WindowAndroid;
 }
 
-namespace WebKit {
-class WebLayer;
-}
-
 namespace content {
 class WebContents;
 
 // Native side of the ContentViewCore.java, which is the primary way of
 // communicating with the native Chromium code on Android.  This is a
 // public interface used by native code outside of the content module.
 class ContentViewCore {
  public:
   // Returns the existing ContentViewCore for |web_contents|, or NULL.
   static ContentViewCore* FromWebContents(WebContents* web_contents);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
   virtual WebContents* GetWebContents() const = 0;
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
   virtual base::android::ScopedJavaLocalRef<jobject> GetContainerViewDelegate()
       = 0;
   virtual ui::WindowAndroid* GetWindowAndroid() const = 0;
-  virtual WebKit::WebLayer* GetWebLayer() const = 0;
+  virtual scoped_refptr<cc::Layer> GetLayer() const = 0;
   virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0;
   virtual void OnWebPreferencesUpdated() = 0;
   virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) = 0;
   virtual void ShowPastePopup(int x, int y) = 0;
   virtual unsigned int GetScaledContentTexture(const gfx::Size& size) = 0;
 
  protected:
   virtual ~ContentViewCore() {};
 };
 
 };  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_