Fix AutoRoll after Git transition

scripts/tools/blink_roller/auto_roll_test.py

Index: scripts/tools/blink_roller/auto_roll_test.py
diff --git a/scripts/tools/blink_roller/auto_roll_test.py b/scripts/tools/blink_roller/auto_roll_test.py
index 093f21149f98c96c60acb66d47fdcc4b8d8c3022..9e313af7e4757c3fea7ef6b3b012a06518468c8e 100755
--- a/scripts/tools/blink_roller/auto_roll_test.py
+++ b/scripts/tools/blink_roller/auto_roll_test.py
@@ -115,6 +115,7 @@ class AutoRollTestBase(SuperMoxTestBase):
                              'get_issue_properties')
     self.mox.StubOutWithMock(auto_roll.rietveld.Rietveld, 'search')
     self.mox.StubOutWithMock(auto_roll.scm.GIT, 'Capture')
+    self.mox.StubOutWithMock(auto_roll.subprocess2, 'call')
     self.mox.StubOutWithMock(auto_roll.subprocess2, 'check_call')
     self.mox.StubOutWithMock(auto_roll.subprocess2, 'check_output')
     self.mox.StubOutWithMock(auto_roll.urllib2, 'urlopen')
@@ -159,14 +160,29 @@ class AutoRollTestBase(SuperMoxTestBase):
     self._get_current_revision()
     self._compare_revs(self.OLD_REV, self.NEW_REV)
 
+    auto_roll.subprocess2.check_call(['git', 'clean', '-d', '-f'])
+    auto_roll.subprocess2.call(['git', 'rebase', '--abort'])
+    auto_roll.subprocess2.call(['git', 'branch', '-D', 'test_project_roll'])
+    auto_roll.subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+    auto_roll.subprocess2.check_call(['git', 'checkout',
+                                      '-b', 'test_project_roll',
+                                      '-t', 'origin/master', '-f'])
+
     from_rev = self._display_rev(self.OLD_REV)
     to_rev = self._display_rev(self.NEW_REV)
-
     message = custom_message or 'Test_Project roll %s:%s' % (from_rev, to_rev)
-
+    message += '\nTBR='
     auto_roll.subprocess2.check_call(
-        ['./tools/safely-roll-deps.py', self.TEST_PROJECT, str(self.NEW_REV),
-         '--message', message, '--force'])
+        ['roll-dep', 'third_party/%s' % self.TEST_PROJECT, str(self.NEW_REV)])
+
+    auto_roll.subprocess2.check_call(['git', 'add', 'DEPS'])
+    auto_roll.subprocess2.check_call(['git', 'commit', '-m', message])
+    auto_roll.subprocess2.check_call(['git', 'cl', 'upload', '--bypass-hooks',
+                                      '--use-commit-queue'])
+    auto_roll.subprocess2.check_call(['git', 'checkout', 'master', '-f'])
+    auto_roll.subprocess2.check_call(['git', 'branch', '-D',
+                                      'test_project_roll'])
+
     issue = self._make_issue(created_datetime=self.CURRENT_DATETIME_STR)
     self._arb._rietveld.search(owner=self.TEST_AUTHOR,
                                closed=2).AndReturn([issue])
@@ -338,7 +354,7 @@ class AutoRollTestSVN(AutoRollTestBase):
 
   DEPS_CONTENT = '''
 vars = {
-  "test_project_revision": "%d",
+  'test_project_revision': '%d',
 }
 ''' % OLD_REV
 
@@ -384,7 +400,7 @@ class AutoRollTestGit(AutoRollTestBase):
 
   DEPS_CONTENT = '''
 vars = {
-  "test_project_revision": "%s",
+  'test_project_revision': '%s',
 }
 ''' % OLD_REV