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

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

Index: content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
index ecfa914141c95c6a8c84af11ef6a6931e28981bb..856f53222d0f1e66faadfde84ccf99f28771999b 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -51,23 +51,27 @@ class VideoCaptureBufferPoolTest
         : size_(size), data_(new uint8[size_.GetArea() * 4]), mapped_(false) {}
     ~MockGpuMemoryBuffer() override { delete[] data_; }
 
-    bool Map(void** data) override {
-      EXPECT_EQ(mapped_, false);
+    bool Map() override {
+      EXPECT_FALSE(mapped_);
       mapped_ = true;
-      data[0] = static_cast<void*>(data_);
       return true;
     }
+    void* memory(size_t plane) override {
+      EXPECT_TRUE(mapped_);
+      EXPECT_EQ(0u, plane);
+      return static_cast<void*>(data_);
+    }
     void Unmap() override {
-      EXPECT_EQ(mapped_, true);
+      EXPECT_TRUE(mapped_);
       mapped_ = false;
     }
     gfx::Size GetSize() const override { return size_; }
     gfx::BufferFormat GetFormat() const override {
       return gfx::BufferFormat::BGRA_8888;
     }
-    void GetStride(int* stride) const override {
-      *stride = size_.width() * 4;
-      return;
+    int stride(size_t plane) const override {
+      EXPECT_EQ(0u, plane);
+      return size_.width() * 4;
     }
     gfx::GpuMemoryBufferId GetId() const override {
       return gfx::GpuMemoryBufferId(0);