OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <map> | 5 #include <map> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
207 Level install_level, | 207 Level install_level, |
208 const char* version, | 208 const char* version, |
209 int channel_modifiers) { | 209 int channel_modifiers) { |
210 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES); | 210 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES); |
211 DCHECK_NE(channel_modifiers & CM_MULTI, 0); | 211 DCHECK_NE(channel_modifiers & CM_MULTI, 0); |
212 | 212 |
213 CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version, | 213 CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version, |
214 channel_modifiers)); | 214 channel_modifiers)); |
215 cmd_line.AppendSwitch(installer::switches::kMultiInstall); | 215 cmd_line.AppendSwitch(installer::switches::kMultiInstall); |
216 cmd_line.AppendSwitch(installer::switches::kChromeAppHost); | 216 cmd_line.AppendSwitch(installer::switches::kChromeAppHost); |
| 217 cmd_line.AppendSwitch(installer::switches::kEnsureGoogleUpdatePresent); |
217 AppCommand app_cmd(cmd_line.GetCommandLineString()); | 218 AppCommand app_cmd(cmd_line.GetCommandLineString()); |
218 app_cmd.set_sends_pings(true); | 219 app_cmd.set_sends_pings(true); |
219 app_cmd.set_is_web_accessible(true); | 220 app_cmd.set_is_web_accessible(true); |
220 commands_.Set(installer::kCmdQuickEnableApplicationHost, app_cmd); | 221 commands_.Set(installer::kCmdQuickEnableApplicationHost, app_cmd); |
221 } | 222 } |
222 | 223 |
223 // Adds the "quick-enable-cf" Google Update product command. | 224 // Adds the "quick-enable-cf" Google Update product command. |
224 void FakeProductState::AddQuickEnableCfCommand( | 225 void FakeProductState::AddQuickEnableCfCommand( |
225 BrowserDistribution::Type dist_type, | 226 BrowserDistribution::Type dist_type, |
226 Level install_level, | 227 Level install_level, |
(...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 InstallationValidatorTest, | 543 InstallationValidatorTest, |
543 Values(InstallationValidator::NO_PRODUCTS, | 544 Values(InstallationValidator::NO_PRODUCTS, |
544 InstallationValidator::CHROME_SINGLE, | 545 InstallationValidator::CHROME_SINGLE, |
545 InstallationValidator::CHROME_MULTI, | 546 InstallationValidator::CHROME_MULTI, |
546 InstallationValidator::CHROME_FRAME_SINGLE, | 547 InstallationValidator::CHROME_FRAME_SINGLE, |
547 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, | 548 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, |
548 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, | 549 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, |
549 InstallationValidator::CHROME_FRAME_MULTI, | 550 InstallationValidator::CHROME_FRAME_MULTI, |
550 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI, | 551 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI, |
551 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI)); | 552 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI)); |
OLD | NEW |