Use chromium revision instead of blink svn revision when rebaselining layout tests.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
@@ skipping 148 matching lines @@
 
     if test_failures.FailureMissingImage in failure_types or test_failures.FailureMissingImageHash in failure_types:
         test_dict['is_missing_image'] = True
 
     if test_failures.FailureTestHarnessAssertion in failure_types:
         test_dict['is_testharness_test'] = True
 
     return test_dict
 
 
-def _chromium_commit_position(scm, path):
-    log = scm.most_recent_log_matching('Cr-Commit-Position:', path)
-    match = re.search('^\s*Cr-Commit-Position:.*@\{#(?P<commit_position>\d+)\}', log, re.MULTILINE)
-    if not match:
-        return ""
-    return str(match.group('commit_position'))
-
-
 def summarize_results(port_obj, expectations, initial_results,
                       all_retry_results, enabled_pixel_tests_in_retry,
                       only_include_failing=False):
     """Returns a dictionary containing a summary of the test runs, with the following fields:
         'version': a version indicator
         'fixable': The number of fixable tests (NOW - PASS)
         'skipped': The number of skipped tests (NOW & SKIPPED)
         'num_regressions': The number of non-flaky failures
         'num_flaky': The number of flaky failures
         'num_passes': The number of expected and unexpected passes
@@ skipping 145 matching lines @@
     results['interrupted'] = initial_results.interrupted  # Does results.html have enough information to compute this itself? (by checking total number of results vs. total number of tests?)
     results['layout_tests_dir'] = port_obj.layout_tests_dir()
     results['has_wdiff'] = port_obj.wdiff_available()
     results['has_pretty_patch'] = port_obj.pretty_patch_available()
     results['pixel_tests_enabled'] = port_obj.get_option('pixel_tests')
     results['seconds_since_epoch'] = int(time.time())
     results['build_number'] = port_obj.get_option('build_number')
     results['builder_name'] = port_obj.get_option('builder_name')
 
     # Don't do this by default since it takes >100ms.
-    # It's only used for uploading data to the flakiness dashboard.
+    # It's only used for rebaselining and uploading data to the flakiness dashboard.
     results['chromium_revision'] = ''
-    results['blink_revision'] = ''
     if port_obj.get_option('builder_name'):
-        for (name, path) in port_obj.repository_paths():
-            scm = port_obj.host.scm_for_path(path)
-            if scm:
-                if name.lower() == 'chromium':
-                    rev = _chromium_commit_position(scm, path)
-                else:
-                    rev = scm.svn_revision(path)
-            if rev:
-                results[name.lower() + '_revision'] = rev
-            else:
-                _log.warn('Failed to determine svn revision for %s, '
-                          'leaving "%s_revision" key blank in full_results.json.'
-                          % (path, name))
+        path = port_obj.repository_path()
+        scm = port_obj.host.scm_for_path(path)
+        if scm:
+            results['chromium_revision'] = scm.commit_position(path)
+        else:
+            _log.warn('Failed to determine chromium commit position for %s, '
+                      'leaving "chromium_revision" key blank in full_results.json.'
+                      % path)
 
     return results