Revert of Refactor source_control.py and add a test.

tools/auto_bisect/bisect_perf_regression_test.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import shutil
 import sys
 import unittest
 
 SRC = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)
 sys.path.append(os.path.join(SRC, 'third_party', 'pymock'))
 
 import bisect_perf_regression
 import bisect_results
 import mock
-import source_control
+import source_control as source_control_module
 
 
 def _GetBisectPerformanceMetricsInstance():
   """Returns an instance of the BisectPerformanceMetrics class."""
   options_dict = {
     'debug_ignore_build': True,
     'debug_ignore_sync': True,
     'debug_ignore_perf_test': True,
     'command': 'fake_command',
     'metric': 'fake/metric',
     'good_revision': 280000,
     'bad_revision': 280005,
   }
   bisect_options = bisect_perf_regression.BisectOptions.FromDict(options_dict)
+  source_control = source_control_module.DetermineAndCreateSourceControl(
+      bisect_options)
   bisect_instance = bisect_perf_regression.BisectPerformanceMetrics(
-      bisect_options)
+      source_control, bisect_options)
   return bisect_instance
 
 
 class BisectPerfRegressionTest(unittest.TestCase):
   """Test case for other functions and classes in bisect-perf-regression.py."""
 
   def setUp(self):
     self.cwd = os.getcwd()
     os.chdir(os.path.abspath(os.path.join(os.path.dirname(__file__),
                                           os.path.pardir, os.path.pardir)))
@@ skipping 154 matching lines @@
     command that works; before some revisions, the browser name that Telemetry
     expects is different in some cases, but we want it to work anyway.
 
     Specifically, only for android:
       After r276628, only android-chrome-shell works.
       Prior to r274857, only android-chromium-testshell works.
       In the range [274857, 276628], both work.
     """
     bisect_options = bisect_perf_regression.BisectOptions()
     bisect_options.output_buildbot_annotations = None
+    source_control = source_control_module.DetermineAndCreateSourceControl(
+        bisect_options)
     bisect_instance = bisect_perf_regression.BisectPerformanceMetrics(
-        bisect_options)
+        source_control, bisect_options)
     bisect_instance.opts.target_platform = target_platform
-    git_revision = source_control.ResolveToRevision(
+    git_revision = bisect_instance.source_control.ResolveToRevision(
         revision, 'chromium', bisect_perf_regression.DEPOT_DEPS_NAME, 100)
     depot = 'chromium'
     command = bisect_instance.GetCompatibleCommand(
         original_command, git_revision, depot)
     self.assertEqual(expected_command, command)
 
   def testGetCompatibleCommand_ChangeToTestShell(self):
     # For revisions <= r274857, only android-chromium-testshell is used.
     self._AssertCompatibleCommand(
         'tools/perf/run_benchmark -v --browser=android-chromium-testshell foo',
@@ skipping 42 matching lines @@
       bisect_instance = _GetBisectPerformanceMetricsInstance()
       results = bisect_instance.Run(bisect_instance.opts.command,
                                     bisect_instance.opts.bad_revision,
                                     bisect_instance.opts.good_revision,
                                     bisect_instance.opts.metric)
       bisect_instance.FormatAndPrintResults(results)
     finally:
       shutil.rmtree = old_rmtree
 
   def testGetCommitPosition(self):
+    bisect_instance = _GetBisectPerformanceMetricsInstance()
     cp_git_rev = '7017a81991de983e12ab50dfc071c70e06979531'
-    self.assertEqual(291765, source_control.GetCommitPosition(cp_git_rev))
+    self.assertEqual(
+        291765, bisect_instance.source_control.GetCommitPosition(cp_git_rev))
 
     svn_git_rev = 'e6db23a037cad47299a94b155b95eebd1ee61a58'
-    self.assertEqual(291467, source_control.GetCommitPosition(svn_git_rev))
+    self.assertEqual(
+        291467, bisect_instance.source_control.GetCommitPosition(svn_git_rev))
 
   def testGetCommitPositionForV8(self):
     bisect_instance = _GetBisectPerformanceMetricsInstance()
     v8_rev = '21d700eedcdd6570eff22ece724b63a5eefe78cb'
     depot_path = os.path.join(bisect_instance.src_cwd, 'v8')
     self.assertEqual(
-        23634, source_control.GetCommitPosition(v8_rev, depot_path))
+        23634,
+        bisect_instance.source_control.GetCommitPosition(v8_rev, depot_path))
 
   def testGetCommitPositionForWebKit(self):
     bisect_instance = _GetBisectPerformanceMetricsInstance()
     wk_rev = 'a94d028e0f2c77f159b3dac95eb90c3b4cf48c61'
     depot_path = os.path.join(bisect_instance.src_cwd, 'third_party', 'WebKit')
     self.assertEqual(
-        181660, source_control.GetCommitPosition(wk_rev, depot_path))
+        181660,
+        bisect_instance.source_control.GetCommitPosition(wk_rev, depot_path))
 
   def testUpdateDepsContent(self):
     bisect_instance = _GetBisectPerformanceMetricsInstance()
     deps_file = 'DEPS'
     # We are intentionally reading DEPS file contents instead of string literal
     # with few lines from DEPS because to check if the format we are expecting
     # to search is not changed in DEPS content.
     # TODO (prasadv): Add a separate test to validate the DEPS contents with the
     # format that bisect script expects.
     deps_contents = bisect_perf_regression.ReadStringFromFile(deps_file)
@@ skipping 188 matching lines @@
           '--diff=%s' % patch_content
           ], (None, 0))
         ]
     self._SetupRunGitMock(try_cmd)
     bisect_perf_regression._BuilderTryjob(
         git_revision, bot_name, bisect_job_name, patch)
 
 
 if __name__ == '__main__':
   unittest.main()