WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.

scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json

Index: scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json
diff --git a/scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json b/scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json
index c73cb52e5e232002f0f28dcc3dd05fb337acb8af..5f98def07b19df67a78567fb2be595ec64f5b755 100644
--- a/scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json
+++ b/scripts/slave/recipes/webrtc/chromium.expected/chromium_webrtc_fyi_Win7_Tester.json
@@ -21,7 +21,11 @@
       "--spec",
       "cache_dir = None\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'}, {'deps_file': 'DEPS', 'managed': True, 'name': 'webrtc.DEPS', 'url': 'svn://svn-mirror.golo.chromium.org/chrome/trunk/deps/third_party/webrtc/webrtc.DEPS'}]",
       "--revision_mapping_file",
+<<<<<<< HEAD
       "{\"src\": \"got_chromium_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/libjingle/source/talk\": \"got_libjingle_revision\", \"src/third_party/libvpx/source\": \"got_libvpx_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+=======
+      "{\"src\": \"got_chromium_revision\", \"src/native_client\": \"got_nacl_revision\", \"src/third_party/WebKit\": \"got_webkit_revision\", \"src/third_party/webrtc\": \"got_revision\", \"src/tools/swarming_client\": \"got_swarming_client_revision\", \"src/v8\": \"got_v8_revision\"}",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -41,6 +45,7 @@
       "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision\": 170242, @@@",
+<<<<<<< HEAD
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libjingle_revision\": 134440, @@@",
@@ -49,6 +54,9 @@
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision\": 11245, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision_cp\": \"refs/heads/master@{#11245}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_libvpx_revision_git\": \"9240a98dab275a8a92a3631502866a58dceb2a49\", @@@",
+=======
+      "@@@STEP_LOG_LINE@json.output@    \"got_chromium_revision_git\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision\": 274981, @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", @@@",
       "@@@STEP_LOG_LINE@json.output@    \"got_nacl_revision_git\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", @@@",
@@ -70,8 +78,18 @@
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@SET_BUILD_PROPERTY@got_nacl_revision@274981@@@",
+<<<<<<< HEAD
       "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
       "@@@SET_BUILD_PROPERTY@got_revision@120644@@@",
+=======
+      "@@@SET_BUILD_PROPERTY@got_webkit_revision@124383@@@",
+      "@@@SET_BUILD_PROPERTY@got_chromium_revision_git@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_revision@120644@@@",
+      "@@@SET_BUILD_PROPERTY@got_swarming_client_revision@276089@@@",
+      "@@@SET_BUILD_PROPERTY@got_chromium_revision@170242@@@",
+      "@@@SET_BUILD_PROPERTY@got_v8_revision@43426@@@",
+      "@@@SET_BUILD_PROPERTY@got_nacl_revision_git@\"d998e125e8253980d76e269b7982aeeefc1b9b50\"@@@",
+>>>>>>> WebRTC: Pass WebRTC revision to perf dashboard for FYI bots.
       "@@@SET_BUILD_PROPERTY@got_webkit_revision_git@\"5e2293dffc3cd07d37fbedea3b500f0eb650614d\"@@@",
       "@@@SET_BUILD_PROPERTY@got_v8_revision_git@\"801ada225ddc271c132c3a35f03975671d43e399\"@@@",
       "@@@SET_BUILD_PROPERTY@got_libvpx_revision@11245@@@",
@@ -178,7 +196,7 @@
       "--perf-dashboard-id=content_browsertests",
       "--perf-id=chromium-webrtc-trunk-tot-rel-win7",
       "--perf-config",
-      "{'a_default_rev': 'r_webrtc_rev'}",
+      "{\"r_webrtc_rev\": \"120644\", \"a_default_rev\": \"r_webrtc_rev\"}",
       "--test-type=content_browsertests",
       "--builder-name=Win7 Tester",
       "--slave-name=TestSlavename",
@@ -209,7 +227,7 @@
       "--perf-dashboard-id=browser_tests",
       "--perf-id=chromium-webrtc-trunk-tot-rel-win7",
       "--perf-config",
-      "{'a_default_rev': 'r_webrtc_rev'}",
+      "{\"r_webrtc_rev\": \"120644\", \"a_default_rev\": \"r_webrtc_rev\"}",
       "--test-type=browser_tests",
       "--builder-name=Win7 Tester",
       "--slave-name=TestSlavename",