Refactoring the master_preferences functions....

chrome/browser/first_run/first_run.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/browser/first_run/first_run.h"
 
 #include "build/build_config.h"
 
 // TODO(port): move more code in back from the first_run_win.cc module.
 
@@ skipping 10 matching lines @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/process_singleton.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace {
 
 // The kSentinelFile file absence will tell us it is a first run.
 const char kSentinelFile[] = "First Run";
 
 FilePath GetDefaultPrefFilePath(bool create_profile_dir,
                                 const FilePath& user_data_dir) {
   FilePath default_pref_dir =
@@ skipping 47 matching lines @@
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
                                         MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
 
   // The standard location of the master prefs is next to the chrome binary.
   FilePath master_prefs;
   if (!PathService::Get(base::DIR_EXE, &master_prefs))
     return true;
   master_prefs = master_prefs.AppendASCII(installer_util::kDefaultMasterPrefs);
 
-  scoped_ptr<DictionaryValue> prefs(
-      installer_util::ParseDistributionPreferences(master_prefs));
-  if (!prefs.get())
+  installer_util::MasterPreferences prefs(master_prefs);
+  if (!prefs.read_from_file())
     return true;
 
-  out_prefs->new_tabs = installer_util::GetFirstRunTabs(prefs.get());
+  out_prefs->new_tabs = prefs.GetFirstRunTabs();
 
   bool value = false;
 
 #if defined(OS_WIN)
   // RLZ is currently a Windows-only phenomenon.  When it comes to the Mac/
   // Linux, enable it here.
-  if (!installer_util::GetDistroIntegerPreference(prefs.get(),
-      installer_util::master_preferences::kDistroPingDelay,
-      &out_prefs->ping_delay)) {
+  if (!prefs.GetInt(installer_util::master_preferences::kDistroPingDelay,
+                    &out_prefs->ping_delay)) {
     // 90 seconds is the default that we want to use in case master
     // preferences is missing, corrupt or ping_delay is missing.
     out_prefs->ping_delay = 90;
   }
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kRequireEula, &value) && value) {
+  if (prefs.GetBool(installer_util::master_preferences::kRequireEula, &value) &&
+      value) {
     // Show the post-installation EULA. This is done by setup.exe and the
     // result determines if we continue or not. We wait here until the user
     // dismisses the dialog.
 
     // The actual eula text is in a resource in chrome. We extract it to
     // a text file so setup.exe can use it as an inner frame.
     FilePath inner_html;
     if (WriteEULAtoTempFile(&inner_html)) {
       int retcode = 0;
       if (!LaunchSetupWithParam(installer_util::switches::kShowEula,
                                 inner_html.ToWStringHack(), &retcode) ||
           (retcode == installer_util::EULA_REJECTED)) {
         LOG(WARNING) << "EULA rejected. Fast exit.";
         ::ExitProcess(1);
       }
       if (retcode == installer_util::EULA_ACCEPTED) {
         VLOG(1) << "EULA : no collection";
         GoogleUpdateSettings::SetCollectStatsConsent(false);
       } else if (retcode == installer_util::EULA_ACCEPTED_OPT_IN) {
         VLOG(1) << "EULA : collection consent";
         GoogleUpdateSettings::SetCollectStatsConsent(true);
       }
     }
   }
 #endif
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kAltFirstRunBubble, &value) && value)
+  if (prefs.GetBool(installer_util::master_preferences::kAltFirstRunBubble,
+                    &value) && value) {
     FirstRun::SetOEMFirstRunBubblePref();
+  }
 
   FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir);
   if (user_prefs.empty())
     return true;
 
   // The master prefs are regular prefs so we can just copy the file
   // to the default place and they just work.
   if (!file_util::CopyFile(master_prefs, user_prefs))
     return true;
 
 #if defined(OS_WIN)
   DictionaryValue* extensions = 0;
-  if (installer_util::HasExtensionsBlock(prefs.get(), &extensions)) {
+  if (prefs.GetExtensionsBlock(&extensions)) {
     VLOG(1) << "Extensions block found in master preferences";
     DoDelayedInstallExtensions();
   }
 #endif
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroImportSearchPref, &value)) {
+  if (prefs.GetBool(installer_util::master_preferences::kDistroImportSearchPref,
+                    &value)) {
     if (value) {
       out_prefs->do_import_items |= importer::SEARCH_ENGINES;
     } else {
       out_prefs->dont_import_items |= importer::SEARCH_ENGINES;
     }
   }
 
   // Check to see if search engine logos should be randomized.
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kSearchEngineExperimentRandomizePref,
-      &value) && value)
+  if (prefs.GetBool(
+          installer_util::master_preferences::
+              kSearchEngineExperimentRandomizePref,
+          &value) && value) {
     out_prefs->randomize_search_engine_experiment = true;
+  }
 
   // If we're suppressing the first-run bubble, set that preference now.
   // Otherwise, wait until the user has completed first run to set it, so the
   // user is guaranteed to see the bubble iff he or she has completed the first
   // run process.
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroSuppressFirstRunBubble,
-      &value) && value)
+  if (prefs.GetBool(
+          installer_util::master_preferences::kDistroSuppressFirstRunBubble,
+          &value) && value)
     FirstRun::SetShowFirstRunBubblePref(false);
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroImportHistoryPref, &value)) {
+  if (prefs.GetBool(
+          installer_util::master_preferences::kDistroImportHistoryPref,
+          &value)) {
     if (value) {
       out_prefs->do_import_items |= importer::HISTORY;
     } else {
       out_prefs->dont_import_items |= importer::HISTORY;
     }
   }
 
   std::string not_used;
-  out_prefs->homepage_defined = prefs->GetString(prefs::kHomePage, &not_used);
+  out_prefs->homepage_defined = prefs.GetString(prefs::kHomePage, &not_used);
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroImportHomePagePref, &value)) {
+  if (prefs.GetBool(
+          installer_util::master_preferences::kDistroImportHomePagePref,
+          &value)) {
     if (value) {
       out_prefs->do_import_items |= importer::HOME_PAGE;
     } else {
       out_prefs->dont_import_items |= importer::HOME_PAGE;
     }
   }
 
   // Bookmarks are never imported unless specifically turned on.
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroImportBookmarksPref, &value)
-      && value) {
+  if (prefs.GetBool(
+          installer_util::master_preferences::kDistroImportBookmarksPref,
+          &value) && value) {
     out_prefs->do_import_items |= importer::FAVORITES;
   }
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
-      value)
+  if (prefs.GetBool(
+          installer_util::master_preferences::kMakeChromeDefaultForUser,
+          &value) && value) {
     out_prefs->make_chrome_default = true;
+  }
 
   // TODO(mirandac): Refactor skip-first-run-ui process into regular first run
   // import process.  http://crbug.com/49647
   // Note we are skipping all other master preferences if skip-first-run-ui
   // is *not* specified. (That is, we continue only if skipping first run ui.)
-  if (!installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroSkipFirstRunPref, &value) ||
-      !value)
+  if (!prefs.GetBool(
+          installer_util::master_preferences::kDistroSkipFirstRunPref,
+          &value) || !value) {
     return true;
+  }
 
 #if !defined(OS_WIN)
   // From here on we won't show first run so we need to do the work to show the
   // bubble anyway, unless it's already been explicitly suppressed.
   FirstRun::SetShowFirstRunBubblePref(true);
 #endif
 
   // We need to be able to create the first run sentinel or else we cannot
   // proceed because ImportSettings will launch the importer process which
   // would end up here if the sentinel is not present.
   if (!FirstRun::CreateSentinel())
     return false;
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kDistroShowWelcomePage, &value) &&
-      value)
+  if (prefs.GetBool(installer_util::master_preferences::kDistroShowWelcomePage,
+                    &value) && value) {
     FirstRun::SetShowWelcomePagePref();
+  }
 
   std::string import_bookmarks_path;
-  installer_util::GetDistroStringPreference(prefs.get(),
+  prefs.GetString(
       installer_util::master_preferences::kDistroImportBookmarksFromFilePref,
       &import_bookmarks_path);
 
 #if defined(OS_WIN)
   std::wstring brand;
   GoogleUpdateSettings::GetBrand(&brand);
   // This should generally be true, as skip_first_run_ui is a setting used for
   // non-organic builds.
   if (!GoogleUpdateSettings::IsOrganic(brand)) {
     // If search engines aren't explicitly imported, don't import.
@@ skipping 26 matching lines @@
   if (!import_bookmarks_path.empty()) {
     // There are bookmarks to import from a file.
     FilePath path = FilePath::FromWStringHack(UTF8ToWide(
         import_bookmarks_path));
     if (!FirstRun::ImportBookmarks(path)) {
       LOG(WARNING) << "silent bookmark import failed";
     }
   }
 #endif
 
-  if (installer_util::GetDistroBooleanPreference(prefs.get(),
-      installer_util::master_preferences::kMakeChromeDefaultForUser, &value) &&
-      value)
+  if (prefs.GetBool(
+          installer_util::master_preferences::kMakeChromeDefaultForUser,
+          &value) && value) {
     ShellIntegration::SetAsDefaultBrowser();
+  }
 
   return false;
 }
 
 // static
 bool FirstRun::IsChromeFirstRun() {
   if (first_run_ != FIRST_RUN_UNKNOWN)
     return first_run_ == FIRST_RUN_TRUE;
 
   FilePath first_run_sentinel;
@@ skipping 341 matching lines @@
   if (!observer->ended()) {
     observer->set_should_quit_message_loop();
     MessageLoop::current()->Run();
   }
 
   // Unfortunately there's no success/fail signal in ImporterHost.
   return true;
 }
 
 #endif  // OS_POSIX