Refactoring the master_preferences functions....

chrome/installer/util/install_util.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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
 #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/string_util.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/l10n_string_util.h"
-#include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/work_item_list.h"
 
 using base::win::RegKey;
+using installer_util::MasterPreferences;
+
+const MasterPreferences& InstallUtil::GetMasterPreferencesForCurrentProcess() {
+  static MasterPreferences prefs(*CommandLine::ForCurrentProcess());
+  return prefs;
+}
 
 bool InstallUtil::ExecuteExeAsAdmin(const std::wstring& exe,
                                     const std::wstring& params,
                                     DWORD* exit_code) {
   SHELLEXECUTEINFO info = {0};
   info.cbSize = sizeof(SHELLEXECUTEINFO);
   info.fMask = SEE_MASK_NOCLOSEPROCESS;
   info.lpVerb = L"runas";
   info.lpFile = exe.c_str();
   info.lpParameters = params.c_str();
@@ skipping 82 matching lines @@
   if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
                                 SHGFP_TYPE_CURRENT, program_files_path))) {
     return !StartsWith(exe_path, program_files_path, false);
   } else {
     NOTREACHED();
   }
   return true;
 }
 
 bool InstallUtil::IsChromeFrameProcess() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  DCHECK(command_line)
-      << "IsChromeFrameProcess() called before ComamandLine::Init()";
-
   FilePath module_path;
   PathService::Get(base::FILE_MODULE, &module_path);
   std::wstring module_name(module_path.BaseName().value());
 
-  scoped_ptr<DictionaryValue> prefs(installer_util::GetInstallPreferences(
-                                    *command_line));
-  DCHECK(prefs.get());
+  const MasterPreferences& prefs = GetMasterPreferencesForCurrentProcess();
   bool is_cf = false;
-  installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kChromeFrame, &is_cf);
+  prefs.GetBool(installer_util::master_preferences::kChromeFrame, &is_cf);
 
   // Also assume this to be a ChromeFrame process if we are running inside
   // the Chrome Frame DLL.
   return is_cf || module_name == installer_util::kChromeFrameDll;
 }
 
 bool InstallUtil::IsChromeSxSProcess() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   CHECK(command_line);
 
   if (command_line->HasSwitch(installer_util::switches::kChromeSxS))
     return true;
 
   // Also return true if we are running from Chrome SxS installed path.
   FilePath exe_dir;
   PathService::Get(base::DIR_EXE, &exe_dir);
   std::wstring chrome_sxs_dir(installer_util::kGoogleChromeInstallSubDir2);
   chrome_sxs_dir.append(installer_util::kSxSSuffix);
   return FilePath::CompareEqualIgnoreCase(exe_dir.BaseName().value(),
                                           installer_util::kInstallBinaryDir) &&
          FilePath::CompareEqualIgnoreCase(exe_dir.DirName().BaseName().value(),
                                           chrome_sxs_dir);
 }
 
 bool InstallUtil::IsMSIProcess(bool system_level) {
   // Initialize the static msi flags.
   static bool is_msi_ = false;
   static bool msi_checked_ = false;
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  CHECK(command_line);
-
   if (!msi_checked_) {
     msi_checked_ = true;
 
-    scoped_ptr<DictionaryValue> prefs(installer_util::GetInstallPreferences(
-                                      *command_line));
-    DCHECK(prefs.get());
+    const MasterPreferences& prefs = GetMasterPreferencesForCurrentProcess();
+
     bool is_msi = false;
-    installer_util::GetDistroBooleanPreference(prefs.get(),
-        installer_util::master_preferences::kMsi, &is_msi);
+    prefs.GetBool(installer_util::master_preferences::kMsi, &is_msi);
 
     if (!is_msi) {
       // We didn't find it in the preferences, try looking in the registry.
       HKEY reg_root = system_level ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
       RegKey key;
       DWORD msi_value;
 
       BrowserDistribution* dist = BrowserDistribution::GetDistribution();
       DCHECK(dist);
 
@@ skipping 74 matching lines @@
                                       const std::wstring& value_name) {
   RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
   VLOG(1) << "Deleting registry value " << value_name;
   if (key.ValueExists(value_name.c_str()) &&
       !key.DeleteValue(value_name.c_str())) {
     LOG(ERROR) << "Failed to delete registry value: " << value_name;
     return false;
   }
   return true;
 }