Let chrome_prefs handle Preferences initialization from master_preferences.

chrome/browser/first_run/first_run.cc

 // Copyright (c) 2012 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 <algorithm>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
-#include "base/json/json_file_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/updater/extension_updater.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/importer_uma.h"
 #include "chrome/browser/importer/profile_writer.h"
+#include "chrome/browser/profiles/profile_impl.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/signin/signin_tracker.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 118 matching lines @@
 
 void DoDelayedInstallExtensionsIfNeeded(
     installer::MasterPreferences* install_prefs) {
   base::DictionaryValue* extensions = 0;
   if (install_prefs->GetExtensionsBlock(&extensions)) {
     VLOG(1) << "Extensions block found in master preferences";
     DoDelayedInstallExtensions();
   }
 }
 
-base::FilePath GetDefaultPrefFilePath(bool create_profile_dir,
-                                      const base::FilePath& user_data_dir) {
-  base::FilePath default_pref_dir =
-      profiles::GetDefaultProfileDir(user_data_dir);
-  if (create_profile_dir) {
-    if (!base::PathExists(default_pref_dir)) {
-      if (!base::CreateDirectory(default_pref_dir))
-        return base::FilePath();
-    }
-  }
-  return profiles::GetProfilePrefsPath(default_pref_dir);
-}
-
 // Sets the |items| bitfield according to whether the import data specified by
 // |import_type| should be be auto imported or not.
 void SetImportItem(PrefService* user_prefs,
                    const char* pref_path,
                    int import_items,
                    int dont_import_items,
                    importer::ImportItem import_type,
                    int* items) {
   // Work out whether an item is to be imported according to what is specified
   // in master preferences.
@@ skipping 264 matching lines @@
   }
 }
 
 }  // namespace
 
 namespace first_run {
 namespace internal {
 
 FirstRunState first_run_ = FIRST_RUN_UNKNOWN;
 
-bool GeneratePrefFile(const base::FilePath& user_data_dir,
-                      const installer::MasterPreferences& master_prefs) {
-  base::FilePath user_prefs = GetDefaultPrefFilePath(true, user_data_dir);
-  if (user_prefs.empty())
-    return false;
-
-  const base::DictionaryValue& master_prefs_dict =
-      master_prefs.master_dictionary();
-
-  JSONFileValueSerializer serializer(user_prefs);
-
-  // Call Serialize (which does IO) on the main thread, which would _normally_
-  // be verboten. In this case however, we require this IO to synchronously
-  // complete before Chrome can start (as master preferences seed the Local
-  // State and Preferences files). This won't trip ThreadIORestrictions as they
-  // won't have kicked in yet on the main thread.
-  return serializer.Serialize(master_prefs_dict);
-}
-
 void SetupMasterPrefsFromInstallPrefs(
     const installer::MasterPreferences& install_prefs,
     MasterPrefs* out_prefs) {
   ConvertStringVectorToGURLVector(
       install_prefs.GetFirstRunTabs(), &out_prefs->new_tabs);
 
   install_prefs.GetInt(installer::master_preferences::kDistroPingDelay,
                        &out_prefs->ping_delay);
 
   bool value = false;
@@ skipping 207 matching lines @@
 
   scoped_ptr<installer::MasterPreferences> install_prefs(LoadMasterPrefs());
 
   // Default value in case master preferences is missing or corrupt, or
   // ping_delay is missing.
   out_prefs->ping_delay = 90;
   if (install_prefs.get()) {
     if (!internal::ShowPostInstallEULAIfNeeded(install_prefs.get()))
       return EULA_EXIT_NOW;
 
-    if (!internal::GeneratePrefFile(user_data_dir, *install_prefs.get()))
-      DLOG(ERROR) << "Failed to generate master_preferences in user data dir.";
+    if (!ProfileImpl::InitializePrefsFromMasterPrefs(
+            profiles::GetDefaultProfileDir(user_data_dir),
+            install_prefs->master_dictionary())) {
+      DLOG(ERROR) << "Failed to initialize from master_preferences.";
+    }
 
     DoDelayedInstallExtensionsIfNeeded(install_prefs.get());
 
     internal::SetupMasterPrefsFromInstallPrefs(*install_prefs, out_prefs);
   }
 
   return FIRST_RUN_PROCEED;
 }
 
 void AutoImport(
@@ skipping 98 matching lines @@
   SetShouldDoPersonalDataManagerFirstRun();
 
   internal::DoPostImportPlatformSpecificTasks(profile);
 }
 
 uint16 auto_import_state() {
   return g_auto_import_state;
 }
 
 }  // namespace first_run