Enable Skia patches to also run layout tests

scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json

Index: scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
diff --git a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
similarity index 96%
copy from scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json
copy to scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
index 43da9111d7be37fa4e61c9e5d749c00352b80d6d..1d76bb79d0d711dde1ff5c91cdc15b279a4ae5c1 100644
--- a/scripts/slave/recipes/chromium_trybot.expected/use_v8_patch_on_blink_trybot.json
+++ b/scripts/slave/recipes/chromium_trybot.expected/use_skia_patch_on_blink_trybot.json
@@ -13,7 +13,7 @@
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'googlecode_url': 'svn://svn-mirror.golo.chromium.org/%s', 'nacl_trunk': 'svn://svn-mirror.golo.chromium.org/native_client/trunk', 'sourceforge_url': 'svn://svn-mirror.golo.chromium.org/%(repo)s', 'webkit_trunk': 'svn://svn-mirror.golo.chromium.org/blink/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/src'}]",
       "--root",
-      "src/v8",
+      "src/third_party/skia",
       "--revision_mapping_file",
       "{\"src\": \"got_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/angle\": \"got_angle_revision\", \"src/third_party/webrtc\": \"got_webrtc_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
       "--git-cache-dir",
@@ -31,7 +31,7 @@
       "--revision",
       "src/third_party/WebKit@HEAD",
       "--revision",
-      "src/v8@HEAD",
+      "src/third_party/skia@HEAD",
       "--output_manifest"
     ],
     "env": {
@@ -45,7 +45,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"src/third_party/WebKit\": \"HEAD\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/third_party/skia\": \"HEAD\"@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"manifest\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"src\": {@@@",
@@ -74,7 +74,7 @@
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }, @@@",
       "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/v8\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/third_party/skia\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", @@@",
@@ -232,13 +232,13 @@
       "--cached",
       "--name-only"
     ],
-    "cwd": "[SLAVE_BUILD]/src/v8",
+    "cwd": "[SLAVE_BUILD]/src",

[rmistry, 2016/04/29 11:04:03]

The diffs in this section are not what I expected. Did I do something wrong?

[Michael Achenbach, 2016/04/29 11:51:41]

Hmm - that's not right indeed. Wonder if it's just simulated wrong. Maybe just
try out in prod and check. I dug a bit but couldn't find right now if I did
anything in v8 to get it to the right cwd...

     "name": "git diff to analyze patch",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_LOG_LINE@files@v8/foo.cc@@@",
+      "@@@STEP_LOG_LINE@files@foo.cc@@@",
       "@@@STEP_LOG_END@files@@@",
-      "@@@SET_BUILD_PROPERTY@subproject_tag@\"blink-paths\"@@@"
+      "@@@SET_BUILD_PROPERTY@subproject_tag@\"chromium\"@@@"
     ]
   },
   {
@@ -278,7 +278,7 @@
       "mac_blink_rel",
       "-v",
       "//out/Release",
-      "{\"additional_compile_targets\": [], \"files\": [\"v8/foo.cc\"], \"test_targets\": [\"blink_tests\"]}",
+      "{\"additional_compile_targets\": [], \"files\": [\"foo.cc\"], \"test_targets\": [\"blink_tests\"]}",
       "/path/to/tmp/json"
     ],
     "env": {