Reland: GpuMemoryBuffer interface change: Map(**) to Map() and memory(plane); stride(plane)

content/renderer/media/video_capture_impl.cc

 // Copyright (c) 2012 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.
 //
 // Notes about usage of this object by VideoCaptureImplManager.
 //
 // VideoCaptureImplManager access this object by using a Unretained()
 // binding and tasks on the IO thread. It is then important that
 // VideoCaptureImpl never post task to itself. All operations must be
 // synchronous.
@@ skipping 61 matching lines @@
     for (size_t i = 0; i < handles_.size(); ++i) {
       const size_t width = media::VideoFrame::Columns(i, format, size_.width());
       const size_t height = media::VideoFrame::Rows(i, format, size_.height());
       buffers_.push_back(GpuMemoryBufferImpl::CreateFromHandle(
           handles_[i],
           gfx::Size(width, height),
           gfx::BufferFormat::R_8,
           gfx::BufferUsage::MAP,
           base::Bind(&ClientBuffer2::DestroyGpuMemoryBuffer,
                      base::Unretained(this))));
-      void* data_ptr = nullptr;
-      buffers_[i]->Map(&data_ptr);
-      data_[i] = reinterpret_cast<uint8*>(data_ptr);
+      bool rv = buffers_[i]->Map();
+      DCHECK(rv);
+      data_[i] = reinterpret_cast<uint8*>(buffers_[i]->memory(0u));
       strides_[i] = width;
     }
   }
 
   uint8* data(int plane) const { return data_[plane]; }
   int32 stride(int plane) const { return strides_[plane]; }
   std::vector<gfx::GpuMemoryBufferHandle> gpu_memory_buffer_handles() {
     return handles_;
   }
 
@@ skipping 471 matching lines @@
   double consumer_resource_utilization = -1.0;
   if (!metadata->GetDouble(media::VideoFrameMetadata::RESOURCE_UTILIZATION,
                            &consumer_resource_utilization)) {
     consumer_resource_utilization = -1.0;
   }
 
   callback_to_io_thread.Run(release_sync_point, consumer_resource_utilization);
 }
 
 }  // namespace content