content: Use type-parameterized tests for GpuMemoryBuffer implementations.

content/browser/gpu/browser_gpu_memory_buffer_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
-#include <vector>
+#include <set>
 
 #include "base/callback.h"
 #include "base/trace_event/memory_dump_provider.h"
 #include "content/common/content_export.h"
-#include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
 
 namespace content {
 
+using GpuMemoryBufferConfiguration =
+    std::pair<gfx::BufferFormat, gfx::BufferUsage>;
+using GpuMemoryBufferConfigurationSet = std::set<GpuMemoryBufferConfiguration>;

[piman, 2015/10/07 01:20:17]

nit: hash_set?

[reveman, 2015/10/07 09:05:01]

Done.

+
 class CONTENT_EXPORT BrowserGpuMemoryBufferManager
     : public gpu::GpuMemoryBufferManager,
       public base::trace_event::MemoryDumpProvider {
  public:
   typedef base::Callback<void(const gfx::GpuMemoryBufferHandle& handle)>
       AllocationCallback;
 
   BrowserGpuMemoryBufferManager(int gpu_client_id,
                                 uint64_t gpu_client_tracing_id);
   ~BrowserGpuMemoryBufferManager() override;
@@ skipping 62 matching lines @@
     gfx::BufferUsage usage;
     int gpu_host_id;
   };
   struct AllocateGpuMemoryBufferRequest;
 
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int32 surface_id);
-  bool IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
-                                               gfx::BufferUsage usage) const;
+  bool IsNativeGpuMemoryBufferConfiguration(gfx::BufferFormat format,
+                                            gfx::BufferUsage usage) const;
   void AllocateGpuMemoryBufferForSurfaceOnIO(
       AllocateGpuMemoryBufferRequest* request);
   void GpuMemoryBufferAllocatedForSurfaceOnIO(
       AllocateGpuMemoryBufferRequest* request,
       const gfx::GpuMemoryBufferHandle& handle);
   void AllocateGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                    const gfx::Size& size,
                                    gfx::BufferFormat format,
                                    gfx::BufferUsage usage,
                                    int client_id,
                                    int surface_id,
                                    bool reused_gpu_process,
                                    const AllocationCallback& callback);
   void GpuMemoryBufferAllocatedOnIO(gfx::GpuMemoryBufferId id,
                                     int client_id,
                                     int surface_id,
                                     int gpu_host_id,
                                     bool reused_gpu_process,
                                     const AllocationCallback& callback,
                                     const gfx::GpuMemoryBufferHandle& handle);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                   int client_id,
                                   uint32 sync_point);
 
   uint64_t ClientIdToTracingProcessId(int client_id) const;
 
-  const gfx::GpuMemoryBufferType factory_type_;
-  const std::vector<GpuMemoryBufferFactory::Configuration>
-      supported_configurations_;
+  const GpuMemoryBufferConfigurationSet native_configurations_;
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
 
   // The GPU process host ID. This should only be accessed on the IO thread.
   int gpu_host_id_;
 
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
   using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
   using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_