Fix the official Windows build - http://build.chromium.org/buildbot/waterfall.fyi/builders/Google%20Chrome%20XP

TEST=none
BUG=none

Review URL: http://codereview.chromium.org/515047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35327 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 55 insertions, 2 deletions

diff --git a/chrome/installer/installer_util.gypi b/chrome/installer/installer_util.gypi
index eeee198..f6c7bbc 100644
--- a/chrome/installer/installer_util.gypi
+++ b/chrome/installer/installer_util.gypi
@@ -25,6 +25,8 @@
           'util/delete_reg_value_work_item.h',
           'util/delete_tree_work_item.cc',
           'util/delete_tree_work_item.h',
+          'util/google_chrome_distribution.cc',
+          'util/google_chrome_distribution.h',
           'util/google_update_constants.cc',
           'util/google_update_constants.h',
           'util/google_update_settings.cc',
@@ -82,8 +84,6 @@
             'util/compat_checks.h',
             'util/delete_after_reboot_helper.cc',
             'util/delete_after_reboot_helper.h',
-            'util/google_chrome_distribution.cc',
-            'util/google_chrome_distribution.h',
             'util/helper.cc',
             'util/helper.h',
             'util/html_dialog.h',
@@ -111,6 +111,9 @@
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
+          'sources': [
+            'util/google_chrome_distribution_dummy.cc',
+          ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
diff --git a/chrome/installer/util/google_chrome_distribution.cc b/chrome/installer/util/google_chrome_distribution.cc
index 6f00a0e..973f61a 100644
--- a/chrome/installer/util/google_chrome_distribution.cc
+++ b/chrome/installer/util/google_chrome_distribution.cc
@@ -122,6 +122,9 @@ bool RelaunchSetup(const std::wstring& flag, int value) {
 
 }  // namespace
 
+// The functions below are not used by the 64-bit Windows binary -
+// see the comment in google_chrome_distribution_dummy.cc
+#ifndef _WIN64
 bool GoogleChromeDistribution::BuildUninstallMetricsString(
     DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
   DCHECK(NULL != metrics);
@@ -185,6 +188,7 @@ bool GoogleChromeDistribution::ExtractUninstallMetrics(
 
   return true;
 }
+#endif
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const installer::Version& version, const std::wstring& local_data_path,
@@ -431,6 +435,9 @@ void GoogleChromeDistribution::UpdateDiffInstallStatus(bool system_install,
   key.Close();
 }
 
+// The functions below are not used by the 64-bit Windows binary -
+// see the comment in google_chrome_distribution_dummy.cc
+#ifndef _WIN64
 // Currently we only have one experiment: the inactive user toast. Which only
 // applies for users doing upgrades and non-systemwide install.
 void GoogleChromeDistribution::LaunchUserExperiment(
@@ -518,3 +525,4 @@ void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) {
   base::LaunchApp(InstallUtil::GetChromeUninstallCmd(false),
                   false, false, NULL);
 }
+#endif
diff --git a/chrome/installer/util/google_chrome_distribution_dummy.cc b/chrome/installer/util/google_chrome_distribution_dummy.cc
new file mode 100644
index 0000000..569dd72
--- /dev/null
+++ b/chrome/installer/util/google_chrome_distribution_dummy.cc
@@ -0,0 +1,42 @@
+// Copyright (c) 2009 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 dummy implementation of several functions from the
+// BrowserDistribution class for Google Chrome. These functions allow 64-bit
+// Windows Chrome binary to build successfully. Since this binary is only used
+// for Native Client support, most of the install/uninstall functionality is not
+// necessary there.
+
+#include "chrome/installer/util/google_chrome_distribution.h"
+
+#include <windows.h>
+
+#include "base/logging.h"
+
+bool GoogleChromeDistribution::BuildUninstallMetricsString(
+    DictionaryValue* uninstall_metrics_dict, std::wstring* metrics) {
+  NOTREACHED();
+  return false;
+}
+
+bool GoogleChromeDistribution::ExtractUninstallMetricsFromFile(
+    const std::wstring& file_path, std::wstring* uninstall_metrics_string) {
+  NOTREACHED();
+  return false;
+}
+
+bool GoogleChromeDistribution::ExtractUninstallMetrics(
+    const DictionaryValue& root, std::wstring* uninstall_metrics_string) {
+  NOTREACHED();
+  return false;
+}
+
+void GoogleChromeDistribution::LaunchUserExperiment(
+    installer_util::InstallStatus status, const installer::Version& version,
+    bool system_install) {
+  NOTREACHED();
+}
+void GoogleChromeDistribution::InactiveUserToastExperiment(int flavor) {
+  NOTREACHED();
+}