android: Migrate old content readback to use async readback (and delegated renderer)

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index f61e01b3a482ea52cb7bc256e2290a8be07a4784..07ab0038cd13cd5427075d4580262475638c0f5d 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -55,9 +55,10 @@ class ContentViewCoreImpl : public ContentViewCore,
   virtual void LoadUrl(NavigationController::LoadURLParams& params) OVERRIDE;
   virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) OVERRIDE;
   virtual void ShowPastePopup(int x, int y) OVERRIDE;
-  virtual unsigned int GetScaledContentTexture(
+  virtual void GetScaledContentBitmap(
       float scale,
-      gfx::Size* out_size) OVERRIDE;
+      gfx::Size* out_size,
+      const base::Callback<void(bool, const SkBitmap&)>& callback) OVERRIDE;
   virtual float GetDpiScale() const OVERRIDE;
   virtual void RequestContentClipping(const gfx::Rect& clipping,
                                       const gfx::Size& content_size) OVERRIDE;
@@ -363,6 +364,12 @@ class ContentViewCoreImpl : public ContentViewCore,
   // Send device_orientation_ to renderer.
   void SendOrientationChangeEventInternal();
 
+  // Callback for scaled content readback
+  static void OnFinishGetScaledContentBitmap(
+      const base::Callback<void(bool, const SkBitmap&)>& compositor_callback,
+      bool success,
+      const SkBitmap& bitmap);
+
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;