Skia recipes: Move Android and ChromeOS config info in from slaves.cfg

scripts/slave/recipes/skia/skia.expected/Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release.json

Index: scripts/slave/recipes/skia/skia.expected/Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/scripts/slave/recipes/skia/skia.expected/Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release.json
similarity index 90%
rename from scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
rename to scripts/slave/recipes/skia/skia.expected/Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release.json
index 478f19b74efe13145107897034dabf4ecd9225e4..37c004261f8f7cf7e6e3b3dcdba10dee896d1c19 100644
--- a/scripts/slave/recipes/skia/skia.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json
+++ b/scripts/slave/recipes/skia/skia.expected/Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release.json
@@ -90,12 +90,14 @@
     "cmd": [
       "make",
       "dm",
-      "BUILDTYPE=Debug"
+      "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
+      "CC": "/usr/bin/clang",
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0"
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_clang_build=1 skia_run_pdfviewer_in_gm=1 skia_warnings_as_errors=0"
     },
     "name": "build dm"
   },
@@ -103,12 +105,14 @@
     "cmd": [
       "make",
       "nanobench",
-      "BUILDTYPE=Debug"
+      "BUILDTYPE=Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
+      "CC": "/usr/bin/clang",
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_gpu=0 skia_warnings_as_errors=0"
+      "CXX": "/usr/bin/clang++",
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_arch_width=64 skia_clang_build=1 skia_run_pdfviewer_in_gm=1 skia_warnings_as_errors=0"
     },
     "name": "build nanobench"
   },
@@ -275,7 +279,7 @@
       "-u",
       "[SLAVE_BUILD]/skia/tools/dm_flags.py",
       "/path/to/tmp/json",
-      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
+      "Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "exec dm_flags.py",
@@ -289,7 +293,7 @@
   {
     "cmd": [
       "catchsegv",
-      "[SLAVE_BUILD]/skia/out/Debug/dm",
+      "[SLAVE_BUILD]/skia/out/Release/dm",
       "--undefok",
       "--verbose",
       "--resourcePath",
@@ -310,23 +314,27 @@
       "arch",
       "x86_64",
       "compiler",
-      "GCC",
+      "Clang",
       "configuration",
-      "Debug",
+      "Release",
       "cpu_or_gpu",
-      "CPU",
+      "GPU",
       "cpu_or_gpu_value",
-      "AVX2",
+      "GeForce320M",
       "model",
-      "GCE",
+      "MacMini4.1",
       "os",
-      "Ubuntu",
+      "Mac10.8",
       "--uninterestingHashesFile",
       "[SLAVE_BUILD]/tmp/uninteresting_hashes.txt",
-      "--nogpu",
+      "--nocpu",
       "--dummy-flags"
     ],
     "cwd": "[SLAVE_BUILD]",
+    "env": {
+      "CC": "/usr/bin/clang",
+      "CXX": "/usr/bin/clang++"
+    },
     "name": "dm"
   },
   {
@@ -336,44 +344,12 @@
       "RECIPE_MODULE[skia]/resources/upload_dm_results.py",
       "[SLAVE_BUILD]/dm",
       "164710",
-      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
+      "Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release",
       "5",
       "",
       "[SLAVE_BUILD]/skia/common/py/utils"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "name": "Upload DM Results"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[SLAVE_BUILD]/skia/tools/nanobench_flags.py",
-      "/path/to/tmp/json",
-      "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug"
-    ],
-    "cwd": "[SLAVE_BUILD]/skia",
-    "name": "exec nanobench_flags.py",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"--dummy-flags\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "catchsegv",
-      "[SLAVE_BUILD]/skia/out/Debug/nanobench",
-      "--undefok",
-      "-i",
-      "[SLAVE_BUILD]/skia/resources",
-      "--skps",
-      "[SLAVE_BUILD]/playback/skps",
-      "--nogpu",
-      "--dummy-flags"
-    ],
-    "cwd": "[SLAVE_BUILD]",
-    "name": "nanobench"
   }
 ]