DEPS: Sync Git subtree mirrors instead of symlinking into chromium/src

tools-webrtc/autoroller/unittests/roll_deps_test.py

 #!/usr/bin/env python
 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import glob
 import os
 import shutil
 import sys
 import tempfile
 import unittest
 
 
 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 PARENT_DIR = os.path.join(SCRIPT_DIR, os.pardir)
 sys.path.append(PARENT_DIR)
 import roll_deps
-from roll_deps import CalculateChangedDepsProper, GetMatchingDepsEntries, \
+from roll_deps import CalculateChangedDeps, GetMatchingDepsEntries, \
   ParseDepsDict, ParseLocalDepsFile, UpdateDepsFile
 
 
 TEST_DATA_VARS = {
   'chromium_git': 'https://chromium.googlesource.com',
   'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d',
 }
 
 DEPS_ENTRIES = {
   'src/build': 'https://build.com',
@@ skipping 79 matching lines @@
 
   def testGetMatchingDepsEntriesHandlesSimilarStartingPaths(self):
     entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing')
     self.assertEquals(len(entries), 2)
 
   def testGetMatchingDepsEntriesHandlesTwoPathsWithIdenticalFirstParts(self):
     entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/build')
     self.assertEquals(len(entries), 1)
     self.assertEquals(entries[0], DEPS_ENTRIES['src/build'])
 
-  def testCalculateChangedDepsProper(self):
+  def testCalculateChangedDeps(self):
     _SetupGitLsRemoteCall(self.fake,
         'https://chromium.googlesource.com/chromium/src/build', BUILD_NEW_REV)
     webrtc_deps = ParseLocalDepsFile(self._webrtc_depsfile)
     new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
-    changed_deps = CalculateChangedDepsProper(webrtc_deps, new_cr_deps)
+    changed_deps = CalculateChangedDeps(webrtc_deps, new_cr_deps)
     self.assertEquals(len(changed_deps), 2)
     self.assertEquals(changed_deps[0].path, 'src/build')
     self.assertEquals(changed_deps[0].current_rev, BUILD_OLD_REV)
     self.assertEquals(changed_deps[0].new_rev, BUILD_NEW_REV)
 
     self.assertEquals(changed_deps[1].path, 'src/buildtools')
     self.assertEquals(changed_deps[1].current_rev, BUILDTOOLS_OLD_REV)
     self.assertEquals(changed_deps[1].new_rev, BUILDTOOLS_NEW_REV)
 
-  def testCalculateChangedDepsLegacy(self):
-    old_cr_deps = ParseLocalDepsFile(self._old_cr_depsfile)
-    new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
-    changed_deps = CalculateChangedDepsProper(old_cr_deps, new_cr_deps)
-    self.assertEquals(len(changed_deps), 1)
-    self.assertEquals(changed_deps[0].path, 'src/buildtools')
-    self.assertEquals(changed_deps[0].current_rev, BUILDTOOLS_OLD_REV)
-    self.assertEquals(changed_deps[0].new_rev, BUILDTOOLS_NEW_REV)
-
 
 def _SetupGitLsRemoteCall(cmd_fake, url, revision):
   cmd = ['git', 'ls-remote', url, revision]
   cmd_fake.add_expectation(cmd, _returns=(revision, None))
 
 
 if __name__ == '__main__':
   unittest.main()