Add BrowserDistribution support for Win64 build

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2012 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <vector>
@@ skipping 272 matching lines @@
   return launched;
 }
 
 }  // namespace
 
 GoogleChromeDistribution::GoogleChromeDistribution()
     : BrowserDistribution(CHROME_BROWSER),
       product_guid_(kChromeGuid) {
 }
 
-// The functions below are not used by the 64-bit Windows binary -
+// The functions below are not used by the NaCl 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
-#ifndef _WIN64
+#if !defined(NACL_WIN64)

[grt (UTC plus 2), 2013/02/04 19:03:47]

under what conditions is this file compiled with NACL_WIN64 defined?

[jschuh, 2013/02/04 19:16:41]

NACL_WIN64 is enabled when building a 64-bit NaCl container (nacl64.exe) as part
of a 32-bit Chrome  Windows build. It's done with a bunch of special purpose
hacks like this, which unfortunately treated _WIN64 and NACL_WIN64 as
equivalent. Brad Nelson fixed most of them a few weeks ago, but it looks like
this one slipped through.

[grt (UTC plus 2), 2013/02/04 19:34:39]

I don't see this file ever being compiled with that #define, though. Perhaps you
can just remove these ifdefs altogether.

[robertshield, 2013/02/04 19:44:33]

What Greg said, at first glance it looks like everything (including NaCl
targets) should just build without this #if

 bool GoogleChromeDistribution::BuildUninstallMetricsString(
     const DictionaryValue* uninstall_metrics_dict, string16* metrics) {
   DCHECK(NULL != metrics);
   bool has_values = false;
 
   for (DictionaryValue::Iterator iter(*uninstall_metrics_dict); !iter.IsAtEnd();
        iter.Advance()) {
     has_values = true;
     metrics->append(L"&");
     metrics->append(UTF8ToWide(iter.key()));
@@ skipping 44 matching lines @@
     return false;
   }
 
   if (!BuildUninstallMetricsString(uninstall_metrics_dict,
                                    uninstall_metrics_string)) {
     return false;
   }
 
   return true;
 }
-#endif
+#endif  // if !defined(NACL_WIN64).
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const Version& version,
     const FilePath& local_data_path,
     const string16& distribution_data) {
   // Send the Chrome version and OS version as params to the form.
   // It would be nice to send the locale, too, but I don't see an
   // easy way to get that in the existing code. It's something we
   // can add later, if needed.
   // We depend on installed_version.GetString() not having spaces or other
@@ skipping 196 matching lines @@
 void GoogleChromeDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
   GoogleUpdateSettings::UpdateInstallStatus(system_install,
       archive_type, InstallUtil::GetInstallReturnCode(install_status),
       product_guid());
 }
 
 // The functions below are not used by the 64-bit Windows binary -
 // see the comment in google_chrome_distribution_dummy.cc
-#ifndef _WIN64
+#if !defined(NACL_WIN64)
 // A helper function that writes to HKLM if the handle was passed through the
 // command line, but HKCU otherwise. |experiment_group| is the value to write
 // and |last_write| is used when writing to HKLM to determine whether to close
 // the handle when done.
 void SetClient(const string16& experiment_group, bool last_write) {
   static int reg_key_handle = -1;
   if (reg_key_handle == -1) {
     // If a specific Toast Results key handle (presumably to our HKLM key) was
     // passed in to the command line (such as for system level installs), we use
     // it. Otherwise, we write to the key under HKCU.
@@ skipping 277 matching lines @@
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
       installer::switches::kSystemLevelToast);
 
   CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
                                                      GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
-#endif  // ifndef _WIN64
+#endif  // if !defined(NACL_WIN64).
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }