Remove all uses of skia::RefPtr and stale includes

ui/ozone/platform/caca/caca_window_manager.cc

 // Copyright 2014 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.
 
 #include "ui/ozone/platform/caca/caca_window_manager.h"
 
 #include <stddef.h>
 
 #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"
 #include "ui/ozone/platform/caca/caca_window.h"
 #include "ui/ozone/platform/caca/scoped_caca_types.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 
 namespace ui {
 
 namespace {
 
 class CacaSurface : public ui::SurfaceOzoneCanvas {
  public:
   CacaSurface(CacaWindow* window);
   ~CacaSurface() override;
 
   bool Initialize();
 
   // ui::SurfaceOzoneCanvas overrides:
-  skia::RefPtr<SkSurface> GetSurface() override;
+  sk_sp<SkSurface> GetSurface() override;
   void ResizeCanvas(const gfx::Size& viewport_size) override;
   void PresentCanvas(const gfx::Rect& damage) override;
   std::unique_ptr<gfx::VSyncProvider> CreateVSyncProvider() override;
 
  private:
   CacaWindow* window_;  // Not owned.
 
   ScopedCacaDither dither_;
 
-  skia::RefPtr<SkSurface> surface_;
+  sk_sp<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(CacaSurface);
 };
 
 CacaSurface::CacaSurface(CacaWindow* window) : window_(window) {
 }
 
 CacaSurface::~CacaSurface() {
 }
 
 bool CacaSurface::Initialize() {
   ResizeCanvas(window_->bitmap_size());
   return true;
 }
 
-skia::RefPtr<SkSurface> CacaSurface::GetSurface() {
+sk_sp<SkSurface> CacaSurface::GetSurface() {
   return surface_;
 }
 
 void CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
   TRACE_EVENT0("ozone", "CacaSurface::ResizeCanvas");
 
   VLOG(2) << "creating libcaca surface with from window " << (void*)window_;
 
   SkImageInfo info = SkImageInfo::Make(window_->bitmap_size().width(),
                                        window_->bitmap_size().height(),
                                        kN32_SkColorType,
                                        kPremul_SkAlphaType);
 
-  surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
+  surface_ = SkSurface::MakeRaster(info);
   if (!surface_)
     LOG(ERROR) << "Failed to create SkSurface";
 
   dither_.reset(caca_create_dither(info.bytesPerPixel() * 8,
                                    info.width(),
                                    info.height(),
                                    info.minRowBytes(),
                                    0x00ff0000,
                                    0x0000ff00,
                                    0x000000ff,
@@ skipping 50 matching lines @@
   CacaWindow* window = windows_.Lookup(widget);
   DCHECK(window);
 
   std::unique_ptr<CacaSurface> canvas(new CacaSurface(window));
   bool initialized = canvas->Initialize();
   DCHECK(initialized);
   return std::move(canvas);
 }
 
 }  // namespace ui