Refactor preference syncing.

chrome/browser/browser_main.cc

Index: chrome/browser/browser_main.cc
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e8c9724b6e25e6e0dcfbe138ed8572e0603aacc5..6b1ec9840291b89003aeb888bbbb502c4e529bfe 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -677,15 +677,22 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
   // Initialize ResourceBundle which handles files loaded from external
   // sources. This has to be done before uninstall code path and before prefs
   // are registered.
-  local_state->RegisterStringPref(prefs::kApplicationLocale, std::string());
+  local_state->RegisterStringPref(prefs::kApplicationLocale,
+                                  std::string(),
+                                  true /* sync pref */);
 #if defined(OS_CHROMEOS)
-  local_state->RegisterStringPref(prefs::kOwnerLocale, std::string());
+  local_state->RegisterStringPref(prefs::kOwnerLocale,
+                                  std::string(),
+                                  false /* don't sync pref */);
   local_state->RegisterStringPref(prefs::kHardwareKeyboardLayout,
-                                  std::string());
+                                  std::string(),
+                                  false /* don't sync pref */);
 #endif  // defined(OS_CHROMEOS)
 #if !defined(OS_CHROMEOS)
-  local_state->RegisterBooleanPref(prefs::kMetricsReportingEnabled,
-      GoogleUpdateSettings::GetCollectStatsConsent());
+  local_state->RegisterBooleanPref(
+      prefs::kMetricsReportingEnabled,
+      GoogleUpdateSettings::GetCollectStatsConsent(),
+      false /* don't sync pref */);
 #endif  // !defined(OS_CHROMEOS)
 
   if (is_first_run) {
@@ -717,7 +724,8 @@ PrefService* InitializeLocalState(const CommandLine& parsed_command_line,
     scoped_ptr<PrefService> parent_local_state(
         PrefService::CreatePrefService(parent_profile, NULL, NULL));
     parent_local_state->RegisterStringPref(prefs::kApplicationLocale,
-                                           std::string());
+                                           std::string(),
+                                           true /* sync pref */);
     // Right now, we only inherit the locale setting from the parent profile.
     local_state->SetString(
         prefs::kApplicationLocale,