Allowing MSI mode detection to work from the master preferences file.

Refactor the piece of master preferences code that was in setup_util.h|cc (setup) into master_preferences.h|cc (install_util). This adds an install_util -> googleurl dependency, which should to be fine.

Add in master_preferences_dummy.cc to keep the nacl64 stuff compiling happily.

Add values.h|cc to the portion of base built in 64 bit mode and add a minor fix to values.cc to make it build.

Also refactor accompanying master_preferences test code from setup tests to install_util tests.

BUG=19370

Review URL: http://codereview.chromium.org/979003

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

1 files changed, 0 insertions, 55 deletions

diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index ad09ec8..2136616 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -33,61 +33,6 @@ int setup_util::ApplyDiffPatch(const std::wstring& src,
   return ApplyBinaryPatch(src.c_str(), patch.c_str(), dest.c_str());
 }
 
-DictionaryValue* setup_util::GetInstallPreferences(
-    const CommandLine& cmd_line) {
-  DictionaryValue* prefs = NULL;
-
-  if (cmd_line.HasSwitch(installer_util::switches::kInstallerData)) {
-    FilePath prefs_path(
-        cmd_line.GetSwitchValue(installer_util::switches::kInstallerData));
-    prefs = installer_util::ParseDistributionPreferences(prefs_path);
-  }
-
-  if (!prefs)
-    prefs = new DictionaryValue();
-
-  if (cmd_line.HasSwitch(installer_util::switches::kCreateAllShortcuts))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kCreateAllShortcuts, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kDoNotCreateShortcuts))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kDoNotCreateShortcuts, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kMsi))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kMsi, true);
-
-  if (cmd_line.HasSwitch(
-        installer_util::switches::kDoNotRegisterForUpdateLaunch))
-    installer_util::SetDistroBooleanPreference(
-        prefs,
-        installer_util::master_preferences::kDoNotRegisterForUpdateLaunch,
-        true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kDoNotLaunchChrome))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kDoNotLaunchChrome, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kMakeChromeDefault))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kMakeChromeDefault, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kSystemLevel))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kSystemLevel, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kVerboseLogging))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kVerboseLogging, true);
-
-  if (cmd_line.HasSwitch(installer_util::switches::kAltDesktopShortcut))
-    installer_util::SetDistroBooleanPreference(
-        prefs, installer_util::master_preferences::kAltShortcutText, true);
-
-  return prefs;
-}
-
 installer::Version* setup_util::GetVersionFromDir(
     const std::wstring& chrome_path) {
   LOG(INFO) << "Looking for Chrome version folder under " << chrome_path;