Dartium 45 roll

tools/dom/scripts/idlsync.py

Index: tools/dom/scripts/idlsync.py
diff --git a/tools/dom/scripts/idlsync.py b/tools/dom/scripts/idlsync.py
index dc49fcef67fa676154d629173a67532240de074d..24aae09cca20debca8b5ede0a60694436dd3114d 100755
--- a/tools/dom/scripts/idlsync.py
+++ b/tools/dom/scripts/idlsync.py
@@ -7,6 +7,7 @@ import optparse
 import os
 import os.path
 import re
+import requests
 import shutil
 import subprocess
 import sys
@@ -15,9 +16,10 @@ import tempfile
 SCRIPT_PATH = os.path.abspath(os.path.dirname(__file__))
 DART_PATH = os.path.abspath(os.path.join(SCRIPT_PATH, '..', '..', '..'))
 
-# Dartium DEPS file with Chrome and WebKit revisions.
-DEPS = ('http://dart.googlecode.com/svn/branches/'
-        'bleeding_edge/deps/dartium.deps/DEPS')
+# Dartium DEPS file from the DEPS file checked into the dart-lang/sdk integration
+# branch.
+DEPS_GIT = ('https://raw.githubusercontent.com/dart-lang/sdk/'
+            'integration/tools/deps/dartium.deps/DEPS')
 
 # Whitelist of files to keep.
 WHITELIST = [
@@ -29,7 +31,7 @@ WHITELIST = [
     ]
 
 # WebKit / WebCore info.
-CHROME_TRUNK = "http://src.chromium.org"
+CHROME_TRUNK = "https://src.chromium.org"
 WEBKIT_URL_PATTERN = r'"dartium_webkit_branch": "(\S+)",'
 WEBKIT_REV_PATTERN = r'"dartium_webkit_revision": "(\d+)",'
 WEBCORE_SUBPATH = 'Source/core'
@@ -84,7 +86,7 @@ DEPTH_INFINITY = 'infinity'
 # DEPS file.
 DEPS_PATTERNS = {
     'webkit': (CHROME_TRUNK, WEBKIT_URL_PATTERN, WEBKIT_REV_PATTERN),
-    'chrome': (CHROME_TRUNK, CHROME_URL_PATTERN, CHROME_REV_PATTERN),
+#    'chrome': (CHROME_TRUNK, CHROME_URL_PATTERN, CHROME_REV_PATTERN),
     }
 
 # List of components to update.
@@ -130,11 +132,9 @@ def RunCommand(cmd, valid_exits=[0]):
     print 'FAILED. RET_CODE=%d' % pipe.returncode
     sys.exit(pipe.returncode)
 
-
-def GetDeps():
-  """Returns the DEPS file contents with pinned revision info."""
-  return RunCommand(['svn', 'cat', DEPS])
-
+def GetDepsFromGit():
+  req = requests.get(DEPS_GIT)
+  return req.text
 
 def GetSvnRevision(deps, component):
   """Returns a tuple with the (dartium webkit repo, latest revision)."""
@@ -208,21 +208,15 @@ def ParseOptions():
                     help='WebKit IDL revision to install', default=None)
   parser.add_option('--chrome-revision', '-c', dest='chrome_revision',
                     help='Chrome IDL revision to install', default=None)
-  parser.add_option('--update', '-u', dest='update',
-                    help='IDL to update (webkit | chrome | all)',
-                    default='webkit')
   args, _ = parser.parse_args()
   update = {}
-  if args.update == 'all' or args.update == 'chrome':
-    update['chrome'] = args.chrome_revision
-  if args.update == 'all' or args.update == 'webkit':
-    update['webkit'] = args.webkit_revision
+  update['webkit'] = args.webkit_revision
   return update
 
 
 def main():
-  deps = GetDeps()
   update = ParseOptions()
+  deps = GetDepsFromGit()
   for (component, remote_path, local_path, readme, depth) in UPDATE_LIST:
     if component in update.keys():
       revision = update[component]