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

content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc

 // Copyright (c) 2013 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.
 
 // Unit test for VideoCaptureBufferPool.
 
 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
@@ skipping 33 matching lines @@
  protected:
   // A GpuMemoryBuffer Mock to provide a trivial RGBA buffer as Map() backing.
   // We need to allocate on ctor and deallocate on dtor so that consecutive
   // Map()-Unmap() cycles yield the same underlying data pointer.
   class MockGpuMemoryBuffer : public gfx::GpuMemoryBuffer {
    public:
     explicit MockGpuMemoryBuffer(const gfx::Size& size)
         : 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);
     }
     gfx::GpuMemoryBufferHandle GetHandle() const override {
       return gfx::GpuMemoryBufferHandle();
     }
     ClientBuffer AsClientBuffer() override { return nullptr; }
 
    private:
@@ skipping 279 matching lines @@
   if (buffer4->data() != nullptr)
     memset(buffer4->data(), 0x77, buffer4->mapped_size());
   buffer4.reset();
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         VideoCaptureBufferPoolTest,
                         testing::ValuesIn(kCapturePixelFormatAndStorages));
 
 } // namespace content