Android: Fix some tab placeholder/thumbnail readbacks

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 52455090ad407c719873d138796bf59dda34136e..c20b37c6496a842276a12fce6e941a789c7f107f 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -501,7 +501,8 @@ bool RenderWidgetHostViewAndroid::HasFocus() const {
 }
 
 bool RenderWidgetHostViewAndroid::IsSurfaceAvailableForCopy() const {
-  return !using_browser_compositor_ || HasValidFrame();
+  return !using_browser_compositor_ ||
+         (HasValidFrame() && surface_factory_.get());
 }
 
 void RenderWidgetHostViewAndroid::Show() {
@@ -893,7 +894,7 @@ void RenderWidgetHostViewAndroid::CopyFromCompositingSurface(
     request->set_area(src_subrect_in_pixel);
   // Make sure the layer doesn't get deleted until we fulfill the request.

[danakj, 2016/07/26 23:20:12]

This comment slightly wrong?

[no sievers, 2016/07/26 23:21:59]

Done.

   LockCompositingSurface();
-  view_.GetLayer()->RequestCopyOfOutput(std::move(request));
+  surface_factory_->RequestCopyOfSurface(surface_id_, std::move(request));
 }
 
 void RenderWidgetHostViewAndroid::CopyFromCompositingSurfaceToVideoFrame(