Fix WebRTC roll script.

tools/roll_webrtc.py

 #!/usr/bin/env python
 # Copyright 2015 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 argparse
 import collections
 import logging
 import os
 import re
 import subprocess
 import sys
 import time
 
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 SRC_DIR = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
 import find_depot_tools
 find_depot_tools.add_depot_tools_to_path()
 import rietveld
-import roll_dep
+import roll_dep_svn
 from gclient import GClientKeywords
 from third_party import upload
 
 # Avoid depot_tools/third_party/upload.py print verbose messages.
 upload.verbosity = 0  # Errors only.
 
 CHROMIUM_GIT_URL = 'https://chromium.googlesource.com/chromium/src.git'
 COMMIT_POSITION_RE = re.compile('^Cr-Original-Commit-Position: .*#([0-9]+).*$')
 CL_ISSUE_RE = re.compile('^Issue number: ([0-9]+) \((.*)\)$')
 RIETVELD_URL_RE = re.compile('^https?://(.*)/(.*)')
@@ skipping 290 matching lines @@
         self._RunCommand(['git', 'cl', 'set_commit'])
         logging.debug('Sent the CL to the CQ. Monitor here: %s', cl_info.url)
 
     # TODO(kjellander): Checkout masters/previous branches again.
     return 0
 
   def _UpdateDep(self, deps_filename, dep_relative_to_src, commit_info):
     dep_name = os.path.join('src', dep_relative_to_src)
     comment = 'commit position %s' % commit_info.commit_position
 
-    # roll_dep.py relies on cwd being the Chromium checkout, so let's
+    # roll_dep_svn.py relies on cwd being the Chromium checkout, so let's
     # temporarily change the working directory and then change back.
     cwd = os.getcwd()
     os.chdir(os.path.dirname(deps_filename))
-    roll_dep.update_deps(deps_filename, dep_relative_to_src, dep_name,
+    roll_dep_svn.update_deps(deps_filename, dep_relative_to_src, dep_name,
                          commit_info.git_commit, comment)
     os.chdir(cwd)
 
   def _DeleteRollBranch(self):
     self._RunCommand(['git', 'checkout', 'master'])
     self._RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME])
     logging.debug('Deleted the local roll branch (%s)', ROLL_BRANCH_NAME)
 
 
   def _GetBranches(self):
@@ skipping 79 matching lines @@
   if args.abort:
     return autoroller.Abort()
   elif args.wait_for_trybots:
     return autoroller.WaitForTrybots()
   else:
     return autoroller.PrepareRoll(args.dry_run, args.ignore_checks,
                                   args.no_commit, args.close_previous_roll)
 
 if __name__ == '__main__':
   sys.exit(main())