Add BrowserDistribution support for Win64 build

chrome/installer/util/google_chrome_distribution.cc

Index: chrome/installer/util/google_chrome_distribution.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution.cc	(revision 180442)
+++ chrome/installer/util/google_chrome_distribution.cc	(working copy)
@@ -290,9 +290,9 @@
       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);
@@ -357,7 +357,7 @@
 
   return true;
 }
-#endif
+#endif  // if !defined(NACL_WIN64).
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const Version& version,
@@ -574,7 +574,7 @@
 
 // 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
@@ -872,7 +872,7 @@
                                                      GetType()));
   base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
 }
-#endif  // ifndef _WIN64
+#endif  // if !defined(NACL_WIN64).
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;