Remove all uses of skia::RefPtr and stale includes

ui/ozone/platform/caca/caca_window_manager.cc

Index: ui/ozone/platform/caca/caca_window_manager.cc
diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc
index 7e1686f909f6ecf0e9b5f0b863718e642da63a37..da4466e2e2c1960f40310ed9a82d20671b4992f8 100644
--- a/ui/ozone/platform/caca/caca_window_manager.cc
+++ b/ui/ozone/platform/caca/caca_window_manager.cc
@@ -9,6 +9,7 @@
 #include "base/macros.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
@@ -28,7 +29,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
   bool Initialize();
 
   // ui::SurfaceOzoneCanvas overrides:
-  skia::RefPtr<SkSurface> GetSurface() override;
+  sk_sp<SkSurface> GetSurface() override;

[f(malita), 2016/05/02 20:15:47]

Hmm, I see the base class signature has already been updated to sk_sp - I
presume this code is not being built currently?

[tomhudson, 2016/05/02 20:20:01]

Either I broke something 3 weeks ago in
https://codereview.chromium.org/1855273002 and we never noticed, or the compiler
has magically been working around that.

[spang, 2016/05/02 21:00:37]

No magic; the build of this platform is indeed currently broken for this and 1
other issue. This patch does fix it - thanks!

This is sample code; it does not ship.

   void ResizeCanvas(const gfx::Size& viewport_size) override;
   void PresentCanvas(const gfx::Rect& damage) override;
   std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
@@ -38,7 +39,7 @@ class CacaSurface : public ui::SurfaceOzoneCanvas {
 
   ScopedCacaDither dither_;
 
-  skia::RefPtr<SkSurface> surface_;
+  sk_sp<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(CacaSurface);
 };
@@ -54,7 +55,7 @@ bool CacaSurface::Initialize() {
   return true;
 }
 
-skia::RefPtr<SkSurface> CacaSurface::GetSurface() {
+sk_sp<SkSurface> CacaSurface::GetSurface() {
   return surface_;
 }
 
@@ -68,7 +69,7 @@ void CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
                                        kN32_SkColorType,
                                        kPremul_SkAlphaType);
 
-  surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
+  surface_ = SkSurface::MakeRaster(info);
   if (!surface_)
     LOG(ERROR) << "Failed to create SkSurface";