Add support for correct Windows 10 version enumeration.

chrome/test/mini_installer/variable_expander.py

 # Copyright 2013 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 base64
 import hashlib
 import os
 import string
 import win32api
 import win32com.client
@@ skipping 58 matching lines @@
         * $CHROME_SHORT_NAME: 'Chrome' (or 'Chromium').
         * $CHROME_LONG_NAME: 'Google Chrome' (or 'Chromium').
         * $CHROME_DIR: the directory of Chrome (or Chromium) from the base
             installation directory.
         * $CHROME_UPDATE_REGISTRY_SUBKEY: the registry key, excluding the root
             key, of Chrome for Google Update.
         * $CHROME_HTML_PROG_ID: 'ChromeHTML' (or 'ChromiumHTM').
         * $USER_SPECIFIC_REGISTRY_SUFFIX: the output from the function
             _GetUserSpecificRegistrySuffix().
         * $WINDOWS_VERSION: a 2-tuple representing the current Windows version.
-        * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1]: a 2-tuple
+        * $VERSION_[XP/SERVER_2003/VISTA/WIN7/WIN8/WIN8_1/WIN10]: a 2-tuple
             representing the version of the corresponding OS.
 
     Args:
       mini_installer_path: The path to mini_installer.exe.
     """
     mini_installer_abspath = os.path.abspath(mini_installer_path)
     mini_installer_file_version = _GetFileVersion(mini_installer_abspath)
     mini_installer_product_name = _GetProductName(mini_installer_abspath)
     program_files_path = shell.SHGetFolderPath(0, shellcon.CSIDL_PROGRAM_FILES,
                                                None, 0)
@@ skipping 32 matching lines @@
         'CHROME_UPDATE_REGISTRY_SUBKEY': chrome_update_registry_subkey,
         'CHROME_HTML_PROG_ID': chrome_html_prog_id,
         'USER_SPECIFIC_REGISTRY_SUFFIX': user_specific_registry_suffix,
         'WINDOWS_VERSION': windows_version,
         'VERSION_XP': '(5, 1)',
         'VERSION_SERVER_2003': '(5, 2)',
         'VERSION_VISTA': '(6, 0)',
         'VERSION_WIN7': '(6, 1)',
         'VERSION_WIN8': '(6, 2)',
         'VERSION_WIN8_1': '(6, 3)',
+        'VERSION_WIN10': '(10, 0)',
     }
 
   def Expand(self, str):
     """Expands variables in the given string.
 
     This method resolves only variables defined in the constructor. It does not
     resolve environment variables. Any dollar signs that are not part of
     variables must be escaped with $$, otherwise a KeyError or a ValueError will
     be raised.
 
     Args:
       str: A string.
 
     Returns:
       A new string created by replacing variables with their values.
     """
     return string.Template(str).substitute(self._variable_mapping)