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

third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py

 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2009 Apple Inc. All rights reserved.
 # Copyright (C) 2011 Daniel Bates (dbates@intudata.com). All rights reserved.
 #
 # 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.
@@ skipping 322 matching lines @@
 
     def _tear_down_git_checkouts(self):
         self._run(['rm', '-rf', self.tracking_git_checkout_path])
         self._run(['rm', '-rf', self.untracking_checkout_path])
 
     def test_remote_branch_ref(self):
         self.assertEqual(self.tracking_scm._remote_branch_ref(), 'refs/remotes/origin/master')
         self._chdir(self.untracking_checkout_path)
         self.assertRaises(ScriptError, self.untracking_scm._remote_branch_ref)
 
-    def test_multiple_remotes(self):
-        self._run(['git', 'config', '--add', 'svn-remote.svn.fetch', 'trunk:remote1'])
-        self._run(['git', 'config', '--add', 'svn-remote.svn.fetch', 'trunk:remote2'])
-        self.assertEqual(self.tracking_scm._remote_branch_ref(), 'remote1')
-
     def test_create_patch(self):
         self._write_text_file('test_file_commit1', 'contents')
         self._run(['git', 'add', 'test_file_commit1'])
         scm = self.tracking_scm
         scm.commit_locally_with_message('message')
 
         patch = scm.create_patch()
         self.assertNotRegexpMatches(patch, r'Subversion Revision:')
 
     def test_exists(self):
         scm = self.untracking_scm
         self._shared_test_exists(scm, scm.commit_locally_with_message)
 
     def test_rename_files(self):
         scm = self.tracking_scm
         scm.move('foo_file', 'bar_file')
         scm.commit_locally_with_message('message')
 
+    def test_commit_position_from_git_log(self):
+        git_log = """
+commit 624c3081c0
+Author: foobarbaz1 <foobarbaz1@chromium.org>
+Date:   Mon Sep 28 19:10:30 2015 -0700
+
+    Test foo bar baz qux 123.
+
+    BUG=000000
+
+    Review URL: https://codereview.chromium.org/999999999
+
+    Cr-Commit-Position: refs/heads/master@{#1234567}
+"""
+        scm = self.tracking_scm
+        self.assertEqual(scm._commit_position_from_git_log(git_log), 1234567)
+
 
 class GitSVNTest(SCMTestBase):
     def setUp(self):
         super(GitSVNTest, self).setUp()
         self._set_up_svn_checkout()
         self._set_up_gitsvn_checkout()
         self.scm = detect_scm_system(self.git_checkout_path)
         self.scm.svn_server_realm = None
 
     def tearDown(self):
@@ skipping 320 matching lines @@
         scm = self.make_scm()
         scm.find_checkout_root = lambda path: ''
         scm._run_git = lambda args: 'Date: 2013-02-08 08:05:49 +0000'
         self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-02-08T08:05:49Z')
 
         scm._run_git = lambda args: 'Date: 2013-02-08 01:02:03 +0130'
         self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-02-07T23:32:03Z')
 
         scm._run_git = lambda args: 'Date: 2013-02-08 01:55:21 -0800'
         self.assertEqual(scm.timestamp_of_revision('some-path', '12345'), '2013-02-08T09:55:21Z')