Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/platform/drm/test/mock_drm_device.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/drm/test/mock_drm_device.h"
 
 #include <xf86drm.h>
 #include <xf86drmMode.h>
 
 #include "base/logging.h"
@@ skipping 185 matching lines @@
 
 bool MockDrmDevice::CreateDumbBuffer(const SkImageInfo& info,
                                      uint32_t* handle,
                                      uint32_t* stride) {
   if (!create_dumb_buffer_expectation_)
     return false;
 
   *handle = allocate_buffer_count_++;
   *stride = info.minRowBytes();
   void* pixels = new char[info.getSafeSize(*stride)];
-  buffers_.push_back(
-      skia::AdoptRef(SkSurface::NewRasterDirect(info, pixels, *stride)));
+  buffers_.push_back(SkSurface::MakeRasterDirect(info, pixels, *stride));
   buffers_[*handle]->getCanvas()->clear(SK_ColorBLACK);
 
   return true;
 }
 
 bool MockDrmDevice::DestroyDumbBuffer(uint32_t handle) {
   if (handle >= buffers_.size() || !buffers_[handle])
     return false;
 
   buffers_[handle].clear();
@@ skipping 35 matching lines @@
 
 void MockDrmDevice::RunCallbacks() {
   while (!callbacks_.empty()) {
     PageFlipCallback callback = callbacks_.front();
     callbacks_.pop();
     callback.Run(0, 0, 0);
   }
 }
 
 }  // namespace ui