Prevent --ensure-google-update-present switch from blocking install if Google Update is missing.

BUG=159200

Review URL: https://chromiumcodereview.appspot.com/12208135

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

2 files changed, 7 insertions, 1 deletions

diff --git a/chrome/installer/util/google_update_util.cc b/chrome/installer/util/google_update_util.cc
index 195436b..4c502fe 100644
--- a/chrome/installer/util/google_update_util.cc
+++ b/chrome/installer/util/google_update_util.cc
@@ -182,6 +182,11 @@ bool EnsureUserLevelGoogleUpdatePresent() {
     string16 cmd_string;
     if (!GetUserLevelGoogleUpdateInstallCommandLine(&cmd_string)) {
       LOG(ERROR) << "Cannot find Google Update at system-level.";
+      // Ideally we should return false. However, this case should not be
+      // encountered by regular users, and developers (who often installs
+      // Chrome without Google Update) may be unduly impeded by this case.
+      // Therefore we return true.
+      success = true;
     } else {
       success = LaunchProcessAndWaitWithTimeout(cmd_string,
           base::TimeDelta::FromMilliseconds(INFINITE));
diff --git a/chrome/installer/util/google_update_util.h b/chrome/installer/util/google_update_util.h
index 1e4995e..30d77e9 100644
--- a/chrome/installer/util/google_update_util.h
+++ b/chrome/installer/util/google_update_util.h
@@ -11,7 +11,8 @@ namespace google_update {
 
 // If user-level Google Update is absent, calls the system-level
 // GoogleUpdateSetup.exe to install it, and waits until it finishes.
-// Returns true if already installed or installed successfully.
+// Returns true if already installed, installed successfully, or
+// if Google Update is not present at system-level.
 // Returns false if the installation fails.
 bool EnsureUserLevelGoogleUpdatePresent();