Fix machine_model behaviors in gpu blacklist.

gpu/config/gpu_control_list_entry_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/json/json_reader.h"
 #include "gpu/config/gpu_control_list.h"
 #include "gpu/config/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define LONG_STRING_CONST(...) #__VA_ARGS__
@@ skipping 38 matching lines @@
     return GetEntryFromString(json, false);
   }
 
   virtual void SetUp() {
     gpu_info_.gpu.vendor_id = 0x10de;
     gpu_info_.gpu.device_id = 0x0640;
     gpu_info_.gpu.active = true;
     gpu_info_.driver_vendor = "NVIDIA";
     gpu_info_.driver_version = "1.6.18";
     gpu_info_.driver_date = "7-14-2009";
-    gpu_info_.machine_model = "MacBookPro 7.1";
     gpu_info_.gl_vendor = "NVIDIA Corporation";
     gpu_info_.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine";
     gpu_info_.performance_stats.graphics = 5.0;
     gpu_info_.performance_stats.gaming = 5.0;
     gpu_info_.performance_stats.overall = 5.0;
   }
 
  protected:
   GPUInfo gpu_info_;
 };
@@ skipping 630 matching lines @@
         ]
       }
   );
   ScopedEntry entry(GetEntryFromString(json));
   EXPECT_TRUE(entry.get() != NULL);
   EXPECT_EQ(GpuControlList::kOsMacosx, entry->GetOsType());
   EXPECT_TRUE(entry->Contains(
       GpuControlList::kOsMacosx, "10.6", gpu_info()));
 }
 
+#if defined(OS_MACOSX)
+TEST_F(GpuControlListEntryTest, MachineModelMac) {
+  const std::string json = LONG_STRING_CONST(
+      {
+        "id": 1,
+        "os": {
+          "type": "macosx"
+        },
+        "machine_model": {
+          "name": {
+            "op": "=",
+            "value": "MacBookPro"
+          },
+          "version": {
+            "op": "=",
+            "value": "7.1"
+          }
+        },
+        "features": [
+          "test_feature_0"
+        ]
+      }
+  );
+  ScopedEntry entry(GetEntryFromString(json));
+  EXPECT_TRUE(entry.get() != NULL);
+  GPUInfo gpu_info;
+  gpu_info_.machine_model = "MacBookPro 7.1";
+  EXPECT_EQ(GpuControlList::kOsMacosx, entry->GetOsType());
+  EXPECT_TRUE(entry->Contains(
+      GpuControlList::kOsMacosx, "10.6", gpu_info));
+}
+#else
+TEST_F(GpuControlListEntryTest, MachineModelNonMac) {
+  const std::string json = LONG_STRING_CONST(
+      {
+        "id": 1,
+        "os": {
+          "type": "android"
+        },
+        "machine_model": {
+          "name": {
+            "op": "=",
+            "value": "Nexus 5"
+          }
+        },
+        "features": [
+          "test_feature_0"
+        ]
+      }
+  );
+  ScopedEntry entry(GetEntryFromString(json));
+  EXPECT_TRUE(entry.get() != NULL);
+  EXPECT_EQ(GpuControlList::kOsAndroid, entry->GetOsType());
+  GPUInfo gpu_info;
+  gpu_info.machine_model = "Nexus 5";
+  EXPECT_TRUE(entry->Contains(
+      GpuControlList::kOsAndroid, "4.1", gpu_info));
+}
+#endif
+
 class GpuControlListEntryDualGPUTest : public GpuControlListEntryTest {
  public:
   GpuControlListEntryDualGPUTest() { }
   virtual ~GpuControlListEntryDualGPUTest() { }
 
   virtual void SetUp() OVERRIDE {
     // Set up a NVIDIA/Intel dual, with NVIDIA as primary and Intel as
     // secondary, and initially Intel is active.
     gpu_info_.gpu.vendor_id = 0x10de;
     gpu_info_.gpu.device_id = 0x0640;
@@ skipping 192 matching lines @@
   );
   // By default, secondary GPU is active.
   EntryShouldNotApply(json);
 
   ActivatePrimaryGPU();
   EntryShouldApply(json);
 }
 
 }  // namespace gpu