Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/gpu/drm_window_unittest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 14 matching lines @@
 
 // Mode of size 6x4.
 const drmModeModeInfo kDefaultMode =
     {0, 6, 0, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0, {'\0'}};
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 const uint32_t kDefaultCrtc = 1;
 const uint32_t kDefaultConnector = 2;
 const int kDefaultCursorSize = 64;
 
-std::vector<skia::RefPtr<SkSurface>> GetCursorBuffers(
+std::vector<sk_sp<SkSurface>> GetCursorBuffers(
     const scoped_refptr<ui::MockDrmDevice> drm) {
-  std::vector<skia::RefPtr<SkSurface>> cursor_buffers;
-  for (const skia::RefPtr<SkSurface>& cursor_buffer : drm->buffers()) {
+  std::vector<sk_sp<SkSurface>> cursor_buffers;
+  for (const sk_sp<SkSurface>& cursor_buffer : drm->buffers()) {
     if (cursor_buffer->width() == kDefaultCursorSize &&
         cursor_buffer->height() == kDefaultCursorSize) {
       cursor_buffers.push_back(cursor_buffer);
     }
   }
 
   return cursor_buffers;
 }
 
 SkBitmap AllocateBitmap(const gfx::Size& size) {
@@ skipping 51 matching lines @@
   message_loop_.reset();
 }
 
 TEST_F(DrmWindowTest, SetCursorImage) {
   const gfx::Size cursor_size(6, 4);
   screen_manager_->GetWindow(kDefaultWidgetHandle)
       ->SetCursor(std::vector<SkBitmap>(1, AllocateBitmap(cursor_size)),
                   gfx::Point(4, 2), 0);
 
   SkBitmap cursor;
-  std::vector<skia::RefPtr<SkSurface>> cursor_buffers = GetCursorBuffers(drm_);
+  std::vector<sk_sp<SkSurface>> cursor_buffers = GetCursorBuffers(drm_);
   EXPECT_EQ(2u, cursor_buffers.size());
 
   // Buffers 1 is the cursor backbuffer we just drew in.
   cursor.setInfo(cursor_buffers[1]->getCanvas()->imageInfo());
   EXPECT_TRUE(cursor_buffers[1]->getCanvas()->readPixels(&cursor, 0, 0));
 
   // Check that the frontbuffer is displaying the right image as set above.
   for (int i = 0; i < cursor.height(); ++i) {
     for (int j = 0; j < cursor.width(); ++j) {
       if (j < cursor_size.width() && i < cursor_size.height())
@@ skipping 21 matching lines @@
   // Move window to the display on the new device.
   screen_manager_->GetWindow(kDefaultWidgetHandle)
       ->OnBoundsChanged(gfx::Rect(0, kDefaultMode.vdisplay,
                                   kDefaultMode.hdisplay,
                                   kDefaultMode.vdisplay));
 
   EXPECT_EQ(2u, GetCursorBuffers(drm).size());
   // Make sure the cursor is showing on the new display.
   EXPECT_NE(0u, drm->get_cursor_handle_for_crtc(kDefaultCrtc));
 }