Check whether Chromium or Google Chrome is being tested.

chrome/test/mini_installer/path_resolver.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 os
 import string
 import win32api
 import win32com.client
 from win32com.shell import shell, shellcon
 
 
+def GetProductName(file_path):
+  """Returns the product name of the given file.
+
+  Args:
+    file_path: The absolute or relative path to the file.
+
+  Returns:
+    A string representing the product name of the file, or None if the product
+    name was not found.
+  """
+  language_and_codepage_pairs = win32api.GetFileVersionInfo(
+      file_path, '\\VarFileInfo\\Translation')
+  if not language_and_codepage_pairs:
+    return None
+  subblock = ('\\StringFileInfo\\%04x%04x\\ProductName' %

[robertshield, 2013/08/29 19:01:07]

nit: subblock -> product_name_entry

[sukolsak, 2013/08/30 02:59:29]

Done.

+              language_and_codepage_pairs[0])
+  return win32api.GetFileVersionInfo(file_path, subblock)

[gab, 2013/08/29 12:31:06]

I find it weird to have to inspect the mini_installer.exe's resources for this.

I think we have to think about how we want this to be running in the wild; can
the build system (which knows about the build's brand) bake a plain text hint in
the build output or something to let us know the build's brand?

Where do we want our scripts to live? Do we want the build system to copy them
to the build output? How do similar python tests requiring EXEs work? Do they
have the EXEs copied to them; are they copied by the EXEs; or are the two simply
linked via command-line?

[robertshield, 2013/08/29 19:01:07]

I actually kind of like the approach taken here in the original CL.
mini_installer (and all Chrome binaries) already have a plain text hint about
the brand - it just so happens to be embedded in the version resource. Working
on the principle that duplicating data is a fundamental evil, I think inspecting
that version resource makes sense.
 
In the Chrome source tree.

Do we want the build system to copy them
I'm curious what the value of copying the scripts would be. I think it's cleaner
to have all paths explicitly specified on the command line and not rely on
copying + the scripts and binaries being in the same directory.

I vote for paths passed explicitly on the command line.

+
+
 def ResolvePath(path):
   """Resolves variables in a file path, and returns the resolved path.
 
   This method resolves only variables defined below. 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:
     path: An absolute or relative path.
 
@@ skipping 12 matching lines @@
             root key, of Chrome for Google Update.
   """
   program_files_path = shell.SHGetFolderPath(0, shellcon.CSIDL_PROGRAM_FILES,
                                              None, 0)
   local_appdata_path = shell.SHGetFolderPath(0, shellcon.CSIDL_LOCAL_APPDATA,
                                              None, 0)
   # TODO(sukolsak): Copy the mini_installer.exe from the build output into here.
   mini_installer_path = os.path.abspath('mini_installer.exe')
   mini_installer_file_version = win32com.client.Dispatch(
       'Scripting.FileSystemObject').GetFileVersion(mini_installer_path)
-  # TODO(sukolsak): Check whether this is Chrome or Chromium.
-  is_chrome = True
-  if is_chrome:
+  mini_installer_product_name = GetProductName(mini_installer_path)
+  if mini_installer_product_name == 'Google Chrome':
     chrome_short_name = 'Chrome'
     chrome_long_name = 'Google Chrome'
     chrome_dir = 'Google\\Chrome'
     chrome_update_registry_subkey = ('Software\\Google\\Update\\Clients\\'
                                      '{8A69D345-D564-463c-AFF1-A69D9E530F96}')
-  else:
+  elif mini_installer_product_name == 'Chromium':
     chrome_short_name = 'Chromium'
     chrome_long_name = 'Chromium'
     chrome_dir = 'Chromium'
     chrome_update_registry_subkey = 'Software\\Chromium'
+  else:
+    raise KeyError("Unknown mini_installer's product name '%s'" %

[grt (UTC plus 2), 2013/08/30 02:39:59]

nit: "mini_installer's" -> "mini_installer"

[sukolsak, 2013/08/30 02:59:29]

Done.

+                   mini_installer_product_name)

[robertshield, 2013/08/29 19:01:07]

This has the side benefit of breaking if mini_installers resources get messed
up. I don't believe we have anything else that tests that currently.

 
   variable_mapping = {
       'PROGRAM_FILES': program_files_path,
       'LOCAL_APPDATA': local_appdata_path,
       'MINI_INSTALLER': mini_installer_path,
       'MINI_INSTALLER_FILE_VERSION': mini_installer_file_version,
       'CHROME_SHORT_NAME': chrome_short_name,
       'CHROME_LONG_NAME': chrome_long_name,
       'CHROME_DIR': chrome_dir,
       'CHROME_UPDATE_REGISTRY_SUBKEY': chrome_update_registry_subkey,
   }
   return string.Template(path).substitute(variable_mapping)