[ChromeDriver] Fix download of older Windows builds

Fix path for downloading older Windows Chrome builds used by
ChromeDriver waterfall.

TBR=crouleau@chromium.org

Change-Id: I936785500de4211a8bdd3e0ce1cdf2fc16e31c8e
Reviewed-on: https://chromium-review.googlesource.com/1227715Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#591595}

chrome/test/chromedriver/archive.py

@@ -46,15 +46,16 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT):
   """
   def GetZipName(revision):
     if util.IsWindows():
-      return revision + '/chrome-win.zip'
+      return revision + (
+          '/chrome-win.zip' if int(revision) > 591478 else '/chrome-win32.zip')
     elif util.IsMac():
       return revision + '/chrome-mac.zip'
     elif util.IsLinux():
       return revision + '/chrome-linux.zip'
 
-  def GetDirName():
+  def GetDirName(revision):
     if util.IsWindows():
-      return 'chrome-win'
+      return 'chrome-win' if int(revision) > 591478 else 'chrome-win32'
     elif util.IsMac():
       return 'chrome-mac'
     elif util.IsLinux():
@@ -74,7 +75,8 @@ def DownloadChrome(revision, dest_dir, site=Site.CHROMIUM_SNAPSHOT):
     print 'Downloading', url, '...'
     urllib.urlretrieve(url, zip_path)
   util.Unzip(zip_path, dest_dir)
-  return os.path.join(dest_dir, GetDirName(), GetChromePathFromPackage())
+  return os.path.join(dest_dir, GetDirName(revision),
+                      GetChromePathFromPackage())
 
 
 def _GetDownloadPlatform():