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

scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json

Index: scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json
diff --git a/scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot.json b/scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json
similarity index 93%
rename from scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot.json
rename to scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json
index 303827bff75e48d6cdafcad91e6dab3ae330f038..08cae3be9d8f0087022a5d3a11ecfb8c45a9b5ec 100644
--- a/scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot.json
+++ b/scripts/slave/recipes/skia/skia.expected/Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot.json
@@ -123,12 +123,12 @@
       "python",
       "make.py",
       "nanobench",
-      "BUILDTYPE=Release"
+      "BUILDTYPE=Release_x64"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "env": {
       "CHROME_PATH": "/home/chrome-bot/src",
-      "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86 skia_arch_width=32 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
+      "GYP_DEFINES": "qt_sdk=C:/Qt/4.8.5/ skia_arch_type=x86_64 skia_arch_width=64 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
     },
     "name": "build nanobench"
   },
@@ -182,7 +182,7 @@
       "python",
       "-u",
       "\nimport os, sys\nfrom common import chromium_utils\n\nif os.path.exists(sys.argv[1]):\n  chromium_utils.RemoveDirectory(sys.argv[1])\n",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data"
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data"
     ],
     "cwd": "[SLAVE_BUILD]",
     "name": "rmtree data",
@@ -201,7 +201,7 @@
       "python",
       "-u",
       "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data",
       "511"
     ],
     "cwd": "[SLAVE_BUILD]",
@@ -225,7 +225,7 @@
       "-u",
       "[SLAVE_BUILD]\\skia\\tools/nanobench_flags.py",
       "/path/to/tmp/json",
-      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot"
+      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot"
     ],
     "cwd": "[SLAVE_BUILD]\\skia",
     "name": "exec nanobench_flags.py",
@@ -250,7 +250,7 @@
   },
   {
     "cmd": [
-      "[SLAVE_BUILD]\\skia\\out\\Release\\nanobench",
+      "[SLAVE_BUILD]\\skia\\out\\Release_x64\\nanobench",
       "--undefok",
       "-i",
       "[SLAVE_BUILD]\\skia\\resources",
@@ -259,7 +259,7 @@
       "--nocpu",
       "--dummy-flags",
       "--outResultsFile",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data\\nanobench_164710_1408633190.json",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data\\nanobench_164710_1408633190.json",
       "--properties",
       "gitHash",
       "164710",
@@ -267,7 +267,7 @@
       "5",
       "--key",
       "arch",
-      "x86",
+      "x86_64",
       "compiler",
       "MSVC",
       "cpu_or_gpu",
@@ -287,9 +287,9 @@
       "python",
       "-u",
       "RECIPE_MODULE[skia]\\resources\\upload_bench_results.py",
-      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot",
+      "Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot",
       "5",
-      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Release-Trybot\\data",
+      "[SLAVE_BUILD]\\perfdata\\Perf-Win7-MSVC-ShuttleA-GPU-HD2000-x86_64-Release-Trybot\\data",
       "164710",
       "[DEPOT_TOOLS]\\third_party\\gsutil\\gsutil",
       "500"