Refactoring the master_preferences functions....

chrome/installer/setup/install.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.
 
 #include "chrome/installer/setup/install.h"
 
 #include <shlobj.h>
 #include <time.h>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/win/registry.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"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
-#include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/master_preferences_constants.h"
 #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_list.h"
 
 // Build-time generated include file.
 #include "installer_util_strings.h"  // NOLINT
 #include "registered_dlls.h"  // NOLINT
 
 namespace {
@@ skipping 688 matching lines @@
     const std::wstring& install_path, const std::wstring& new_version) {
   std::wstring installer_path(install_path);
   file_util::AppendToPath(&installer_path, new_version);
   file_util::AppendToPath(&installer_path, installer_util::kInstallerDir);
   return installer_path;
 }
 
 installer_util::InstallStatus installer::InstallOrUpdateChrome(
     const std::wstring& exe_path, const std::wstring& archive_path,
     const std::wstring& install_temp_path, const std::wstring& prefs_path,
-    const DictionaryValue* prefs, const Version& new_version,
+    const installer_util::MasterPreferences& prefs, const Version& new_version,
     const Version* installed_version) {
   bool system_install = false;
-  installer_util::GetDistroBooleanPreference(prefs,
-      installer_util::master_preferences::kSystemLevel, &system_install);
+  prefs.GetBool(installer_util::master_preferences::kSystemLevel,
+                &system_install);
   std::wstring install_path(GetChromeInstallPath(system_install));
   if (install_path.empty()) {
     LOG(ERROR) << "Could not get installation destination path.";
     return installer_util::INSTALL_FAILED;
   }
   VLOG(1) << "install destination path: " << install_path;
 
   std::wstring src_path(install_temp_path);
   file_util::AppendToPath(&src_path, std::wstring(kInstallSourceDir));
   file_util::AppendToPath(&src_path, std::wstring(kInstallSourceChromeDir));
 
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   std::wstring current_version;
   installer_util::InstallStatus result = InstallNewVersion(exe_path,
       archive_path, src_path, install_path, install_temp_path, reg_root,
       new_version, &current_version);
 
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   if (!dist->GetInstallReturnCode(result)) {
     if (result == installer_util::FIRST_INSTALL_SUCCESS)
       CopyPreferenceFileForFirstRun(system_install, prefs_path);
 
     bool value = false;
-    if (!installer_util::GetDistroBooleanPreference(prefs,
-        installer_util::master_preferences::kDoNotCreateShortcuts, &value) ||
-        !value) {
+    if (!prefs.GetBool(
+            installer_util::master_preferences::kDoNotCreateShortcuts,
+            &value) || !value) {
       bool create_all_shortcut = false;
-      installer_util::GetDistroBooleanPreference(prefs,
-          installer_util::master_preferences::kCreateAllShortcuts,
-          &create_all_shortcut);
+      prefs.GetBool(installer_util::master_preferences::kCreateAllShortcuts,
+                    &create_all_shortcut);
       bool alt_shortcut = false;
-      installer_util::GetDistroBooleanPreference(prefs,
-          installer_util::master_preferences::kAltShortcutText,
-          &alt_shortcut);
+      prefs.GetBool(installer_util::master_preferences::kAltShortcutText,
+                    &alt_shortcut);
       if (!CreateOrUpdateChromeShortcuts(exe_path, install_path,
                                          new_version.GetString(), result,
                                          system_install, create_all_shortcut,
-                                         alt_shortcut))
+                                         alt_shortcut)) {
         LOG(WARNING) << "Failed to create/update start menu shortcut.";
+      }
 
       bool make_chrome_default = false;
-      installer_util::GetDistroBooleanPreference(prefs,
-          installer_util::master_preferences::kMakeChromeDefault,
-          &make_chrome_default);
+      prefs.GetBool(installer_util::master_preferences::kMakeChromeDefault,
+                    &make_chrome_default);
 
       // If this is not the user's first Chrome install, but they have chosen
       // Chrome to become their default browser on the download page, we must
       // force it here because the master_preferences file will not get copied
       // into the build.
       bool force_chrome_default_for_user = false;
       if (result == installer_util::NEW_VERSION_UPDATED ||
           result == installer_util::INSTALL_REPAIRED) {
-        installer_util::GetDistroBooleanPreference(prefs,
+        prefs.GetBool(
             installer_util::master_preferences::kMakeChromeDefaultForUser,
             &force_chrome_default_for_user);
       }
 
       RegisterChromeOnMachine(install_path, system_install,
           make_chrome_default || force_chrome_default_for_user);
     }
 
     std::wstring latest_version_to_keep(new_version.GetString());
     if (!current_version.empty())
       latest_version_to_keep.assign(current_version);
     RemoveOldVersionDirs(install_path, latest_version_to_keep);
   }
 
   return result;
 }