Remove all uses of skia::RefPtr and stale includes

android_webview/browser/browser_view_renderer.cc

Index: android_webview/browser/browser_view_renderer.cc
diff --git a/android_webview/browser/browser_view_renderer.cc b/android_webview/browser/browser_view_renderer.cc
index 058431b26cddd1aa958a610783c887c9a2ac9038..f6c274fb4e30d971bf0e3cece2730c86521a2e88 100644
--- a/android_webview/browser/browser_view_renderer.cc
+++ b/android_webview/browser/browser_view_renderer.cc
@@ -309,15 +309,15 @@ bool BrowserViewRenderer::OnDrawSoftware(SkCanvas* canvas) {
   return CanOnDraw() && CompositeSW(canvas);
 }
 
-skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width,
-                                                            int height) {
+sk_sp<SkPicture> BrowserViewRenderer::CapturePicture(int width,
+                                                     int height) {
   TRACE_EVENT0("android_webview", "BrowserViewRenderer::CapturePicture");
 
   // Return empty Picture objects for empty SkPictures.
   if (width <= 0 || height <= 0) {
     SkPictureRecorder emptyRecorder;
     emptyRecorder.beginRecording(0, 0);
-    return skia::AdoptRef(emptyRecorder.finishRecordingAsPicture());
+    return sk_sp<SkPicture>(emptyRecorder.finishRecordingAsPicture());

[f(malita), 2016/05/02 16:51:41]

finishRecordingAsPicture() returns an sk_sp<SkPicture> - no need to repackage.

   }
 
   SkPictureRecorder recorder;
@@ -332,7 +332,7 @@ skia::RefPtr<SkPicture> BrowserViewRenderer::CapturePicture(int width,
     compositor_->DidChangeRootLayerScrollOffset(
         gfx::ScrollOffset(scroll_offset_dip_));
   }
-  return skia::AdoptRef(recorder.finishRecordingAsPicture());
+  return sk_sp<SkPicture>(recorder.finishRecordingAsPicture());

[f(malita), 2016/05/02 16:51:41]

Ditto.

 }
 
 void BrowserViewRenderer::EnableOnNewPicture(bool enabled) {