BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 10 insertions, 14 deletions

diff --git a/chromium/tools/bisect-builds.py b/chromium/tools/bisect-builds.py
index 6db0047963a..6d0830f8d29 100755
--- a/chromium/tools/bisect-builds.py
+++ b/chromium/tools/bisect-builds.py
@@ -27,9 +27,7 @@ CHANGELOG_URL = ('https://chromium.googlesource.com/chromium/src/+log/%s..%s')
 CRREV_URL = ('https://cr-rev.appspot.com/_ah/api/crrev/v1/redirect/')
 
 # DEPS file URL.
-DEPS_FILE_OLD = ('http://src.chromium.org/viewvc/chrome/trunk/src/'
-                 'DEPS?revision=%d')
-DEPS_FILE_NEW = ('https://chromium.googlesource.com/chromium/src/+/%s/DEPS')
+DEPS_FILE = ('https://chromium.googlesource.com/chromium/src/+/%s/DEPS')
 
 # Blink changelogs URL.
 BLINK_CHANGELOG_URL = ('http://build.chromium.org'
@@ -159,6 +157,8 @@ class PathContext(object):
       self._binary_name = 'Chromium.app/Contents/MacOS/Chromium'
     elif self.platform == 'win':
       self._listing_platform_dir = 'Win/'
+    elif self.platform == 'win64':
+      self._listing_platform_dir = 'Win_x64/'
 
   def GetASANPlatformDir(self):
     """ASAN builds are in directories like "linux-release", or have filenames
@@ -527,9 +527,11 @@ def RunRevision(context, revision, zip_file, profile, num_runs, command, args):
   # Hack: Chrome OS archives are missing icudtl.dat; try to copy it from
   # the local directory.
   if context.platform == 'chromeos':
-    icudtl_path = 'third_party/icu/source/data/in/icudtl.dat'
+    icudtl_path = 'third_party/icu/common/icudtl.dat'
     if not os.access(icudtl_path, os.F_OK):
       print 'Couldn\'t find: ' + icudtl_path
+      print ('The path might have changed. Please look for the data under '
+             'third_party/icu and update bisect-build.py')
       sys.exit()
     os.system('cp %s %s/chrome-linux/' % (icudtl_path, tempdir))
 
@@ -896,17 +898,11 @@ def GetBlinkDEPSRevisionForChromiumRevision(self, rev):
     if m:
       return m.group(1)
 
-  url = urllib.urlopen(DEPS_FILE_OLD % rev)
+  url = urllib.urlopen(DEPS_FILE % GetGitHashFromSVNRevision(rev))
   if url.getcode() == 200:
-    # . doesn't match newlines without re.DOTALL, so this is safe.
-    blink_re = re.compile(r'webkit_revision\D*(\d+)')
-    return int(_GetBlinkRev(url, blink_re))
-  else:
-    url = urllib.urlopen(DEPS_FILE_NEW % GetGitHashFromSVNRevision(rev))
-    if url.getcode() == 200:
-      blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)')
-      blink_git_sha = _GetBlinkRev(url, blink_re)
-      return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink')
+    blink_re = re.compile(r'webkit_revision\D*\d+;\D*\d+;(\w+)')
+    blink_git_sha = _GetBlinkRev(url, blink_re)
+    return self.GetSVNRevisionFromGitHash(blink_git_sha, 'blink')
   raise Exception('Could not get Blink revision for Chromium rev %d' % rev)