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

trunk/src/content/browser/gpu/gpu_data_manager_impl_private_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 "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "content/browser/gpu/gpu_data_manager_impl_private.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
@@ skipping 140 matching lines @@
         "version": "0.1",
         "entries": [
           {
             "id": 1,
             "features": [
               "webgl"
             ]
           },
           {
             "id": 2,
-            "gl_renderer": ".*GeForce.*",
+            "gl_renderer": {
+              "op": "contains",
+              "value": "GeForce"
+            },
             "features": [
               "accelerated_2d_canvas"
             ]
           }
         ]
       }
   );
 
   gpu::GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x10de;
@@ skipping 23 matching lines @@
 
   const std::string blacklist_json = LONG_STRING_CONST(
       {
         "name": "gpu blacklist",
         "version": "0.1",
         "entries": [
           {
             "id": 1,
             "exceptions": [
               {
-                "gl_renderer": ".*GeForce.*"
+                "gl_renderer": {
+                  "op": "contains",
+                  "value": "GeForce"
+                }
               }
             ],
             "features": [
               "webgl"
             ]
           }
         ]
       }
   );
   gpu::GPUInfo gpu_info;
@@ skipping 513 matching lines @@
   EXPECT_TRUE(manager->UpdateActiveGpu(0x8086, 0x04a1));
   {
     base::RunLoop run_loop;
     run_loop.RunUntilIdle();
   }
   EXPECT_TRUE(observer.gpu_info_updated());
   EXPECT_EQ(1u, manager->GetBlacklistedFeatureCount());
 }
 
 }  // namespace content