Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(277)

Unified Diff: chrome/installer/util/installation_validator.cc

Issue 10957016: Ensuring Google Update at user-level is installed alongside App Host, for the quick-enable App Host… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removing time-out, and wait for Google Update to install; moving flag to InstallerState; adding to … Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/installation_validator.cc
diff --git a/chrome/installer/util/installation_validator.cc b/chrome/installer/util/installation_validator.cc
index 206eb5003c35353ff42b47b24f6a818c12cbbcbb..e8a795d58203eef69ab2fe694aae6e22e33faf95 100644
--- a/chrome/installer/util/installation_validator.cc
+++ b/chrome/installer/util/installation_validator.cc
@@ -125,7 +125,7 @@ void InstallationValidator::ChromeAppHostRules::AddUninstallSwitchExpectations(
SwitchExpectations* expectations) const {
DCHECK(!system_install);
- // --chrome-app-host must be present.
+ // --app-host must be present.
expectations->push_back(std::make_pair(std::string(switches::kChromeAppHost),
true));
// --chrome must not be present.
@@ -332,12 +332,14 @@ void InstallationValidator::ValidateQuickEnableApplicationHostCommand(
SwitchExpectations expected;
- expected.push_back(
- std::make_pair(std::string(switches::kChromeAppHost), true));
- expected.push_back(std::make_pair(std::string(switches::kSystemLevel),
- false));
- expected.push_back(std::make_pair(std::string(switches::kMultiInstall),
- true));
+ expected.push_back(std::make_pair(
+ std::string(switches::kChromeAppHost), true));
+ expected.push_back(std::make_pair(
+ std::string(switches::kSystemLevel), false));
+ expected.push_back(std::make_pair(
+ std::string(switches::kMultiInstall), true));
+ expected.push_back(std::make_pair(
+ std::string(switches::kEnsureGoogleUpdatePresent), true));
ValidateCommandExpectations(ctx,
the_command,

Powered by Google App Engine
This is Rietveld 408576698