Revert of Make ContentViewRenderView::CompositeToBitmap not CompositeAndReadback.

content/browser/android/content_view_render_view.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_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 22 matching lines @@
   void Destroy(JNIEnv* env, jobject obj);
   void SetCurrentContentViewCore(JNIEnv* env, jobject obj,
                                  jlong native_content_view_core);
   void SetLayerTreeBuildHelper(
       JNIEnv* env, jobject obj, jlong native_build_helper);
   void SurfaceCreated(JNIEnv* env, jobject obj);
   void SurfaceDestroyed(JNIEnv* env, jobject obj);
   void SurfaceChanged(JNIEnv* env, jobject obj,
                       jint format, jint width, jint height, jobject surface);
   jboolean Composite(JNIEnv* env, jobject obj);
+  jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap);
   void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
 
   // CompositorClient ---------------------------------------------------------
   virtual void ScheduleComposite() OVERRIDE;
   virtual void OnSwapBuffersPosted() OVERRIDE;
   virtual void OnSwapBuffersCompleted() OVERRIDE;
 
  private:
   virtual ~ContentViewRenderView();
 
@@ skipping 10 matching lines @@
   int current_surface_format_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
 };
 
 
 
 }
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_