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

components/mus/gles2/mojo_gpu_memory_buffer.h

Index: components/mus/gles2/mojo_gpu_memory_buffer.h
diff --git a/components/mus/gles2/mojo_gpu_memory_buffer.h b/components/mus/gles2/mojo_gpu_memory_buffer.h
index e0c6ccfcbb9dd17d5d8287a4f404f8deaefa6bcb..309746794e391ab3faf317241285321fe53acd0d 100644
--- a/components/mus/gles2/mojo_gpu_memory_buffer.h
+++ b/components/mus/gles2/mojo_gpu_memory_buffer.h
@@ -27,11 +27,12 @@ class MojoGpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   const unsigned char* GetMemory() const;
 
   // Overridden from gfx::GpuMemoryBuffer:
-  bool Map(void** data) override;
+  bool Map() override;
+  void* memory(size_t plane) override;
   void Unmap() override;
   gfx::Size GetSize() const override;
   gfx::BufferFormat GetFormat() const override;
-  void GetStride(int* stride) const override;
+  int stride(size_t plane) const override;
   gfx::GpuMemoryBufferId GetId() const override;
   gfx::GpuMemoryBufferHandle GetHandle() const override;
   ClientBuffer AsClientBuffer() override;