Revert 289308 "Revert 289154 "Revert 289067 "Use RE string patte..."

trunk/src/gpu/config/gpu_control_list.h

 // 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.
 
 #ifndef GPU_CONFIG_GPU_CONTROL_LIST_H_
 #define GPU_CONFIG_GPU_CONTROL_LIST_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 174 matching lines @@
     OsType type() const;
 
     // Maps string to OsType; returns kOsUnknown if it's not a valid os.
     static OsType StringToOsType(const std::string& os);
 
    private:
     OsType type_;
     scoped_ptr<VersionInfo> version_info_;
   };
 
+  class GPU_EXPORT StringInfo {
+   public:
+    StringInfo(const std::string& string_op, const std::string& string_value);
+
+    // Determines if a given string is included in the StringInfo.
+    bool Contains(const std::string& value) const;
+
+    // Determines if the StringInfo contains valid information.
+    bool IsValid() const;
+
+   private:
+    enum Op {
+      kContains,
+      kBeginWith,
+      kEndWith,
+      kEQ,  // =
+      kUnknown  // Indicates StringInfo data is invalid.
+    };
+
+    // Maps string to Op; returns kUnknown if it's not a valid Op.
+    static Op StringToOp(const std::string& string_op);
+
+    Op op_;
+    std::string value_;
+  };
+
   class GPU_EXPORT FloatInfo {
    public:
     FloatInfo(const std::string& float_op,
               const std::string& float_value,
               const std::string& float_value2);
 
     // Determines if a given float is included in the FloatInfo.
     bool Contains(float value) const;
 
     // Determines if the FloatInfo contains valid information.
@@ skipping 132 matching lines @@
     bool SetVendorId(const std::string& vendor_id_string);
 
     bool AddDeviceId(const std::string& device_id_string);
 
     bool SetMultiGpuStyle(const std::string& multi_gpu_style_string);
 
     bool SetMultiGpuCategory(const std::string& multi_gpu_category_string);
 
     bool SetGLType(const std::string& gl_type_string);
 
-    bool SetDriverVendorInfo(const std::string& vendor_value);
+    bool SetDriverVendorInfo(const std::string& vendor_op,
+                             const std::string& vendor_value);
 
     bool SetDriverVersionInfo(const std::string& version_op,
                               const std::string& version_style,
                               const std::string& version_string,
                               const std::string& version_string2);
 
     bool SetDriverDateInfo(const std::string& date_op,
                            const std::string& date_string,
                            const std::string& date_string2);
 
     bool SetGLVersionInfo(const std::string& version_op,
                           const std::string& version_string,
                           const std::string& version_string2);
 
-    bool SetGLVendorInfo(const std::string& vendor_value);
+    bool SetGLVendorInfo(const std::string& vendor_op,
+                         const std::string& vendor_value);
 
-    bool SetGLRendererInfo(const std::string& renderer_value);
+    bool SetGLRendererInfo(const std::string& renderer_op,
+                           const std::string& renderer_value);
 
-    bool SetGLExtensionsInfo(const std::string& extensions_value);
+    bool SetGLExtensionsInfo(const std::string& extensions_op,
+                             const std::string& extensions_value);
 
     bool SetGLResetNotificationStrategyInfo(const std::string& op,
                                             const std::string& int_string,
                                             const std::string& int_string2);
 
-    bool SetCpuBrand(const std::string& cpu_value);
+    bool SetCpuBrand(const std::string& cpu_op,
+                     const std::string& cpu_value);
 
     bool SetPerfGraphicsInfo(const std::string& op,
                              const std::string& float_string,
                              const std::string& float_string2);
 
     bool SetPerfGamingInfo(const std::string& op,
                            const std::string& float_string,
                            const std::string& float_string2);
 
     bool SetPerfOverallInfo(const std::string& op,
@@ skipping 43 matching lines @@
     bool disabled_;
     std::string description_;
     std::vector<int> cr_bugs_;
     std::vector<int> webkit_bugs_;
     scoped_ptr<OsInfo> os_info_;
     uint32 vendor_id_;
     std::vector<uint32> device_id_list_;
     MultiGpuStyle multi_gpu_style_;
     MultiGpuCategory multi_gpu_category_;
     GLType gl_type_;
-    std::string driver_vendor_info_;
+    scoped_ptr<StringInfo> driver_vendor_info_;
     scoped_ptr<VersionInfo> driver_version_info_;
     scoped_ptr<VersionInfo> driver_date_info_;
     scoped_ptr<VersionInfo> gl_version_info_;
-    std::string gl_vendor_info_;
-    std::string gl_renderer_info_;
-    std::string gl_extensions_info_;
+    scoped_ptr<StringInfo> gl_vendor_info_;
+    scoped_ptr<StringInfo> gl_renderer_info_;
+    scoped_ptr<StringInfo> gl_extensions_info_;
     scoped_ptr<IntInfo> gl_reset_notification_strategy_info_;
-    std::string cpu_brand_;
+    scoped_ptr<StringInfo> cpu_brand_;
     scoped_ptr<FloatInfo> perf_graphics_info_;
     scoped_ptr<FloatInfo> perf_gaming_info_;
     scoped_ptr<FloatInfo> perf_overall_info_;
     std::vector<std::string> machine_model_name_list_;
     scoped_ptr<VersionInfo> machine_model_version_info_;
     scoped_ptr<IntInfo> gpu_count_info_;
     scoped_ptr<BoolInfo> direct_rendering_info_;
     std::set<int> features_;
     std::vector<ScopedGpuControlListEntry> exceptions_;
   };
@@ skipping 24 matching lines @@
   bool supports_feature_type_all_;
 
   bool control_list_logging_enabled_;
   std::string control_list_logging_name_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_CONTROL_LIST_H_