Migrate the Android compositor to cc::Layer classes.

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 91926f7f0a0ea58a952cd83ee3eeffdc65b673d7..566c165c7d6cb52abf6a3475e42945d647069a46 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -19,6 +19,7 @@
 #include "base/callback.h"
 #include "base/pickle.h"
 #include "base/supports_user_data.h"
+#include "cc/layer.h"
 #include "content/components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
@@ -28,6 +29,7 @@
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/base/x509_certificate.h"
+#include "ui/gfx/transform.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
@@ -37,6 +39,7 @@ using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
+using cc::Layer;
 using content::BrowserThread;
 using content::ContentViewCore;
 using content::InterceptNavigationDelegate;
@@ -84,7 +87,7 @@ class NullCompositor : public content::Compositor {
   virtual ~NullCompositor() {}
 
   // Compositor
-  virtual void SetRootLayer(WebKit::WebLayer* root) OVERRIDE {}
+  virtual void SetRootLayer(scoped_refptr<cc::Layer> root) OVERRIDE {}
   virtual void SetWindowBounds(const gfx::Size& size) OVERRIDE {}
   virtual void SetVisible(bool visible) OVERRIDE {}
   virtual void SetWindowSurface(ANativeWindow* window) OVERRIDE {}
@@ -171,7 +174,7 @@ void AwContents::DidInitializeContentViewCore(JNIEnv* env, jobject obj,
                                               jint content_view_core) {
   ContentViewCore* core = reinterpret_cast<ContentViewCore*>(content_view_core);
   DCHECK(core == ContentViewCore::FromWebContents(web_contents_.get()));
-  compositor_->SetRootLayer(core->GetWebLayer());
+  compositor_->SetRootLayer(core->GetLayer());
 }
 
 void AwContents::Destroy(JNIEnv* env, jobject obj) {