cleanup

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

2 files changed, 10 insertions, 14 deletions

diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc
index 8d6a4db..ba62f0c 100644
--- a/chrome/installer/setup/install.cc
+++ b/chrome/installer/setup/install.cc
@@ -7,13 +7,11 @@
 
 #include "chrome/installer/setup/install.h"
 
-#include "base/command_line.h"
 #include "base/file_util.h"
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
-#include "base/string_util.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/installer/setup/setup_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/create_reg_key_work_item.h"
@@ -24,8 +22,6 @@
 #include "chrome/installer/util/set_reg_value_work_item.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
-#include "chrome/installer/util/work_item.h"
-#include "chrome/installer/util/version.h"
 #include "chrome/installer/util/work_item_list.h"
 
 // Build-time generated include file.
@@ -486,7 +482,7 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome(
     const std::wstring& exe_path, const std::wstring& archive_path,
     const std::wstring& install_temp_path, const DictionaryValue* prefs,
     const Version& new_version, const Version* installed_version) {
-  bool system_install = installer_util::GetBooleanPreference(prefs,
+  bool system_install = installer_util::GetDistroBooleanPreference(prefs,
       installer_util::master_preferences::kSystemLevel);
   std::wstring install_path(GetChromeInstallPath(system_install));
   if (install_path.empty()) {
@@ -528,9 +524,9 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome(
       result = installer_util::NEW_VERSION_UPDATED;
     }
 
-    bool create_all_shortcut = installer_util::GetBooleanPreference(prefs,
+    bool create_all_shortcut = installer_util::GetDistroBooleanPreference(prefs,
         installer_util::master_preferences::kCreateAllShortcuts);
-    bool alt_shortcut = installer_util::GetBooleanPreference(prefs,
+    bool alt_shortcut = installer_util::GetDistroBooleanPreference(prefs,
         installer_util::master_preferences::kAltShortcutText);
     if (!CreateOrUpdateChromeShortcuts(exe_path, install_path,
                                        new_version.GetString(), result,
@@ -540,7 +536,7 @@ installer_util::InstallStatus installer::InstallOrUpdateChrome(
 
     RemoveOldVersionDirs(install_path, new_version.GetString());
 
-    bool make_chrome_default = installer_util::GetBooleanPreference(prefs,
+    bool make_chrome_default = installer_util::GetDistroBooleanPreference(prefs,
         installer_util::master_preferences::kMakeChromeDefault);
     RegisterChromeOnMachine(install_path, system_install, make_chrome_default);
   }
diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc
index 0f0d41a..daae996 100644
--- a/chrome/installer/setup/setup_main.cc
+++ b/chrome/installer/setup/setup_main.cc
@@ -301,7 +301,7 @@ bool CheckPreInstallConditions(const installer::Version* installed_version,
 
 installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
     const installer::Version* installed_version, const DictionaryValue* prefs) {
-  bool system_level = installer_util::GetBooleanPreference(prefs,
+  bool system_level = installer_util::GetDistroBooleanPreference(prefs,
       installer_util::master_preferences::kSystemLevel);
   installer_util::InstallStatus install_status = installer_util::UNKNOWN_STATUS;
   if (!CheckPreInstallConditions(installed_version,
@@ -395,11 +395,11 @@ installer_util::InstallStatus InstallChrome(const CommandLine& cmd_line,
                                           install_msg_base, &chrome_exe);
         if (install_status == installer_util::FIRST_INSTALL_SUCCESS) {
           LOG(INFO) << "First install successful.";
-          if (installer_util::GetBooleanPreference(prefs,
+          if (installer_util::GetDistroBooleanPreference(prefs,
               installer_util::master_preferences::kMasterPreferencesValid))
             CopyPreferenceFileForFirstRun(system_level, cmd_line);
           // We never want to launch Chrome in system level install mode.
-          if (!system_level && !installer_util::GetBooleanPreference(prefs,
+          if (!system_level && !installer_util::GetDistroBooleanPreference(prefs,
               installer_util::master_preferences::kDoNotLaunchChrome))
             installer::LaunchChrome(system_level);
         }
@@ -617,11 +617,11 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
   const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
   installer::InitInstallerLogging(parsed_command_line);
   scoped_ptr<DictionaryValue> prefs(GetInstallPreferences(parsed_command_line));
-  if (installer_util::GetBooleanPreference(prefs.get(),
+  if (installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kVerboseLogging))
     logging::SetMinLogLevel(logging::LOG_INFO);
 
-  bool system_install = installer_util::GetBooleanPreference(prefs.get(),
+  bool system_install = installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kSystemLevel);
   LOG(INFO) << "system install is " << system_install;