Fix skip EXTMultisampleCompatibilityTest.DrawAlphaOneAndResolve

gpu/config/gpu_test_config.h

 // 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.
 
 #ifndef GPU_CONFIG_GPU_TEST_CONFIG_H_
 #define GPU_CONFIG_GPU_TEST_CONFIG_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 47 matching lines @@
   };
 
   GPUTestConfig();
   GPUTestConfig(const GPUTestConfig& other);
   virtual ~GPUTestConfig();
 
   void set_os(int32_t os);
   void set_gpu_device_id(uint32_t id);
   void set_build_type(int32_t build_type);
   void set_api(int32_t api);
+  void set_machine_model_name(const std::string& machine_model_name);
 
   virtual void AddGPUVendor(uint32_t gpu_vendor);
 
   int32_t os() const { return os_; }
   const std::vector<uint32_t>& gpu_vendor() const { return gpu_vendor_; }
   uint32_t gpu_device_id() const { return gpu_device_id_; }
   int32_t build_type() const { return build_type_; }
   int32_t api() const { return api_; }
+  std::string machine_model_name() const { return machine_model_name_; }

[Zhenyao Mo, 2017/03/11 18:29:16]

nit: return const std::string&

 
   // Check if the config is valid. For example, if gpu_device_id_ is set, but
   // gpu_vendor_ is unknown, then it's invalid.
   virtual bool IsValid() const;
 
   // Check if two configs overlap, i.e., if there exists a config that matches
   // both configs.
   bool OverlapsWith(const GPUTestConfig& config) const;
 
   // Disable validation of GPU vendor and device ids.
@@ skipping 14 matching lines @@
   std::vector<uint32_t> gpu_vendor_;
 
   // GPU device id (unique to each vendor).
   uint32_t gpu_device_id_;
 
   // Release or Debug.
   int32_t build_type_;
 
   // Back-end rendering APIs.
   int32_t api_;
+
+  // The machine model identifier. See GPUInfo for details.
+  std::string machine_model_name_;
 };
 
 class GPU_EXPORT GPUTestBotConfig : public GPUTestConfig {
  public:
   GPUTestBotConfig() { }
   ~GPUTestBotConfig() override;
 
   // This should only be called when no gpu_vendor is added.
   void AddGPUVendor(uint32_t gpu_vendor) override;
 
@@ skipping 19 matching lines @@
   static bool CurrentConfigMatches(const std::vector<std::string>& configs);
 
   // Check if the bot has blacklisted all GPU features.
   static bool GpuBlacklistedOnBot();
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_TEST_CONFIG_H_