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

Side by Side Diff: chrome/installer/util/installation_validator_unittest.cc

Issue 7386002: Rename CommandLine::GetCommandLineString(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge. Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/installation_validator.cc ('k') | chrome/installer/util/product.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES); 204 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
205 DCHECK_NE(channel_modifiers & CM_MULTI, 0); 205 DCHECK_NE(channel_modifiers & CM_MULTI, 0);
206 206
207 CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version, 207 CommandLine cmd_line(GetSetupExePath(dist_type, install_level, version,
208 channel_modifiers)); 208 channel_modifiers));
209 cmd_line.AppendSwitch(installer::switches::kMultiInstall); 209 cmd_line.AppendSwitch(installer::switches::kMultiInstall);
210 if (install_level == SYSTEM_LEVEL) 210 if (install_level == SYSTEM_LEVEL)
211 cmd_line.AppendSwitch(installer::switches::kSystemLevel); 211 cmd_line.AppendSwitch(installer::switches::kSystemLevel);
212 cmd_line.AppendSwitch(installer::switches::kChromeFrameQuickEnable); 212 cmd_line.AppendSwitch(installer::switches::kChromeFrameQuickEnable);
213 commands_.Set(installer::kCmdQuickEnableCf, 213 commands_.Set(installer::kCmdQuickEnableCf,
214 AppCommand(cmd_line.command_line_string(), true, true)); 214 AppCommand(cmd_line.GetCommandLineString(), true, true));
215 } 215 }
216 216
217 // Removes the "quick-enable-cf" Google Update product command. 217 // Removes the "quick-enable-cf" Google Update product command.
218 void FakeProductState::RemoveQuickEnableCfCommand( 218 void FakeProductState::RemoveQuickEnableCfCommand(
219 BrowserDistribution::Type dist_type) { 219 BrowserDistribution::Type dist_type) {
220 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES); 220 DCHECK_EQ(dist_type, BrowserDistribution::CHROME_BINARIES);
221 221
222 commands_.Remove(installer::kCmdQuickEnableCf); 222 commands_.Remove(installer::kCmdQuickEnableCf);
223 } 223 }
224 224
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 InstallationValidatorTest, 487 InstallationValidatorTest,
488 Values(InstallationValidator::NO_PRODUCTS, 488 Values(InstallationValidator::NO_PRODUCTS,
489 InstallationValidator::CHROME_SINGLE, 489 InstallationValidator::CHROME_SINGLE,
490 InstallationValidator::CHROME_MULTI, 490 InstallationValidator::CHROME_MULTI,
491 InstallationValidator::CHROME_FRAME_SINGLE, 491 InstallationValidator::CHROME_FRAME_SINGLE,
492 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE, 492 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_SINGLE,
493 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI, 493 InstallationValidator::CHROME_FRAME_SINGLE_CHROME_MULTI,
494 InstallationValidator::CHROME_FRAME_MULTI, 494 InstallationValidator::CHROME_FRAME_MULTI,
495 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI, 495 InstallationValidator::CHROME_FRAME_MULTI_CHROME_MULTI,
496 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI)); 496 InstallationValidator::CHROME_FRAME_READY_MODE_CHROME_MULTI));
OLDNEW
« no previous file with comments | « chrome/installer/util/installation_validator.cc ('k') | chrome/installer/util/product.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698