Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/test/mock_drm_device.h

 // 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.
 
 #ifndef UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_
 #define UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_
 
 #include <map>
 #include <queue>
 #include <vector>
 
-#include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 
 namespace ui {
 
 class CrtcController;
 struct GammaRampRGBEntry;
 
 // The real DrmDevice makes actual DRM calls which we can't use in unit tests.
 class MockDrmDevice : public ui::DrmDevice {
@@ skipping 19 matching lines @@
   void set_page_flip_expectation(bool state) { page_flip_expectation_ = state; }
   void set_add_framebuffer_expectation(bool state) {
     add_framebuffer_expectation_ = state;
   }
   void set_create_dumb_buffer_expectation(bool state) {
     create_dumb_buffer_expectation_ = state;
   }
 
   uint32_t current_framebuffer() const { return current_framebuffer_; }
 
-  const std::vector<skia::RefPtr<SkSurface>> buffers() const {
-    return buffers_;
-  }
+  const std::vector<sk_sp<SkSurface>> buffers() const { return buffers_; }
 
   uint32_t get_cursor_handle_for_crtc(uint32_t crtc) const {
     const auto it = crtc_cursor_map_.find(crtc);
     return it != crtc_cursor_map_.end() ? it->second : 0;
   }
 
   void RunCallbacks();
 
   // DrmDevice:
   ScopedDrmCrtcPtr GetCrtc(uint32_t crtc_id) override;
@@ skipping 65 matching lines @@
 
   bool set_crtc_expectation_;
   bool add_framebuffer_expectation_;
   bool page_flip_expectation_;
   bool create_dumb_buffer_expectation_;
 
   bool use_sync_flips_;
 
   uint32_t current_framebuffer_;
 
-  std::vector<skia::RefPtr<SkSurface>> buffers_;
+  std::vector<sk_sp<SkSurface>> buffers_;
 
   std::map<uint32_t, uint32_t> crtc_cursor_map_;
 
   std::queue<PageFlipCallback> callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(MockDrmDevice);
 };
 
 }  // namespace ui
 
 #endif  // UI_OZONE_PLATFORM_DRM_TEST_MOCK_DRM_DEVICE_H_