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

trunk/src/gpu/config/gpu_control_list_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.
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "gpu/config/gpu_control_list.h"
 #include "gpu/config/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 285 matching lines @@
         "version": "0.1",
         "entries": [
           {
             "id": 1,
             "os": {
               "type": "linux"
             },
             "vendor_id": "0x8086",
             "exceptions": [
               {
-                "gl_renderer": ".*mesa.*"
+                "gl_renderer": {
+                  "op": "contains",
+                  "value": "mesa"
+                }
               }
             ],
             "features": [
               "test_feature_0"
             ]
           }
         ]
       }
   );
   GPUInfo gpu_info;
@@ skipping 217 matching lines @@
     // For non AMD switchable
     gpu_info.amd_switchable = false;
     features = control_list->MakeDecision(
         GpuControlList::kOsWin, kOsVersion, gpu_info);
     EXPECT_EMPTY_SET(features);
   }
 }
 
 }  // namespace gpu