Attempt to reland http://codereview.chromium.org/4928002/...

chrome/installer/util/master_preferences_unittest.cc

 // Copyright (c) 2010 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.
 //
 // Unit tests for master preferences related methods.
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 285 matching lines @@
         << expected_bool2[i].name;
   }
 
   EXPECT_FALSE(prefs2.GetBool(
       installer_util::master_preferences::kSystemLevel, &value));
   EXPECT_FALSE(prefs2.GetBool(
       installer_util::master_preferences::kVerboseLogging, &value));
 }
 
 TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
-  const std::wstring kChromeInstall(L"setup.exe");
-  const std::wstring kCfInstall(StringPrintf(L"setup.exe --%ls",
-      installer_util::switches::kChromeFrame));
-  const std::wstring kCeeeInstall(StringPrintf(L"setup.exe --%ls",
-      installer_util::switches::kCeee));
+  std::wstringstream chrome_cmd, cf_cmd, ceee_cmd;
+  chrome_cmd << "setup.exe";
+  cf_cmd << "setup.exe --" << installer_util::switches::kChromeFrame;
+  ceee_cmd << "setup.exe --" << installer_util::switches::kCeee;
 
-  CommandLine chrome_install(CommandLine::FromString(kChromeInstall));
-  CommandLine cf_install(CommandLine::FromString(kCfInstall));
-  CommandLine ceee_install(CommandLine::FromString(kCeeeInstall));
+  CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
+  CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
+  CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
 
   installer_util::MasterPreferences pref_chrome(chrome_install);
   installer_util::MasterPreferences pref_cf(cf_install);
   installer_util::MasterPreferences pref_ceee(ceee_install);
 
   EXPECT_FALSE(pref_chrome.is_multi_install());
   EXPECT_TRUE(pref_chrome.install_chrome());
   EXPECT_FALSE(pref_chrome.install_ceee());
   EXPECT_FALSE(pref_chrome.install_chrome_frame());
 
   EXPECT_FALSE(pref_cf.is_multi_install());
   EXPECT_FALSE(pref_cf.install_chrome());
   EXPECT_FALSE(pref_cf.install_ceee());
   EXPECT_TRUE(pref_cf.install_chrome_frame());
 
   EXPECT_FALSE(pref_ceee.is_multi_install());
   EXPECT_FALSE(pref_ceee.install_chrome());
   EXPECT_TRUE(pref_ceee.install_ceee());
   EXPECT_TRUE(pref_ceee.install_chrome_frame());
 }
 
 TEST_F(MasterPreferencesTest, TestMultiInstallConfig) {
-  const std::wstring kChromeInstall(StringPrintf(L"setup.exe --%ls --%ls",
-      installer_util::switches::kMultiInstall,
-      installer_util::switches::kChrome));
-  const std::wstring kCfInstall(StringPrintf(L"setup.exe --%ls --%ls",
-      installer_util::switches::kMultiInstall,
-      installer_util::switches::kChromeFrame));
-  const std::wstring kCeeeInstall(StringPrintf(L"setup.exe --%ls --%ls",
-      installer_util::switches::kMultiInstall,
-      installer_util::switches::kCeee));
-  const std::wstring kChromeCfInstall(
-      StringPrintf(L"setup.exe --%ls --%ls --%ls",
-          installer_util::switches::kMultiInstall,
-          installer_util::switches::kChrome,
-          installer_util::switches::kChromeFrame));
-  const std::wstring kChromeCeeeCfInstall(
-      StringPrintf(L"setup.exe --%ls --%ls --%ls --%ls",
-          installer_util::switches::kMultiInstall,
-          installer_util::switches::kChrome,
-          installer_util::switches::kChromeFrame,
-          installer_util::switches::kCeee));
+  using installer_util::switches::kMultiInstall;
+  using installer_util::switches::kChrome;
+  using installer_util::switches::kChromeFrame;
+  using installer_util::switches::kCeee;
 
-  CommandLine chrome_install(CommandLine::FromString(kChromeInstall));
-  CommandLine cf_install(CommandLine::FromString(kCfInstall));
-  CommandLine ceee_install(CommandLine::FromString(kCeeeInstall));
-  CommandLine chrome_cf_install(CommandLine::FromString(kChromeCfInstall));
+  std::wstringstream chrome_cmd, cf_cmd, ceee_cmd, chrome_cf_cmd,
+      chrome_ceee_cf_cmd;
+  chrome_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome;
+  cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChromeFrame;
+  ceee_cmd << "setup.exe --" << kMultiInstall << " --" << kCeee;
+  chrome_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
+      " --" << kChromeFrame;
+  chrome_ceee_cf_cmd << "setup.exe --" << kMultiInstall << " --" << kChrome <<
+      " --" << kChromeFrame << " --" << kCeee;
+
+  CommandLine chrome_install(CommandLine::FromString(chrome_cmd.str()));
+  CommandLine cf_install(CommandLine::FromString(cf_cmd.str()));
+  CommandLine ceee_install(CommandLine::FromString(ceee_cmd.str()));
+  CommandLine chrome_cf_install(CommandLine::FromString(chrome_cf_cmd.str()));
   CommandLine chrome_cf_ceee_install(
-      CommandLine::FromString(kChromeCeeeCfInstall));
+      CommandLine::FromString(chrome_ceee_cf_cmd.str()));
 
   installer_util::MasterPreferences pref_chrome(chrome_install);
   installer_util::MasterPreferences pref_cf(cf_install);
   installer_util::MasterPreferences pref_ceee(ceee_install);
   installer_util::MasterPreferences pref_chrome_cf(chrome_cf_install);
   installer_util::MasterPreferences pref_all(chrome_cf_ceee_install);
 
   EXPECT_TRUE(pref_chrome.is_multi_install());
   EXPECT_TRUE(pref_chrome.install_chrome());
   EXPECT_FALSE(pref_chrome.install_ceee());
@@ skipping 13 matching lines @@
   EXPECT_TRUE(pref_chrome_cf.install_chrome());
   EXPECT_FALSE(pref_chrome_cf.install_ceee());
   EXPECT_TRUE(pref_chrome_cf.install_chrome_frame());
 
   EXPECT_TRUE(pref_all.is_multi_install());
   EXPECT_TRUE(pref_all.install_chrome());
   EXPECT_TRUE(pref_all.install_ceee());
   EXPECT_TRUE(pref_all.install_chrome_frame());
 }