| Index: chrome/browser/metrics/metrics_service.cc
 | 
| diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
 | 
| index 11f61bc88b2e66d7f117fc28ae2c65c3cab2ee69..61b9e737e91b6ed835373408b66e94662e219893 100644
 | 
| --- a/chrome/browser/metrics/metrics_service.cc
 | 
| +++ b/chrome/browser/metrics/metrics_service.cc
 | 
| @@ -355,54 +355,123 @@ class MetricsService::InitTask : public Task {
 | 
|  // static
 | 
|  void MetricsService::RegisterPrefs(PrefService* local_state) {
 | 
|    DCHECK(IsSingleThreaded());
 | 
| -  local_state->RegisterStringPref(prefs::kMetricsClientID, "");
 | 
| -  local_state->RegisterInt64Pref(prefs::kMetricsClientIDTimestamp, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kStabilityLaunchTimeSec, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kStabilityLastTimestampSec, 0);
 | 
| -  local_state->RegisterStringPref(prefs::kStabilityStatsVersion, "");
 | 
| -  local_state->RegisterInt64Pref(prefs::kStabilityStatsBuildTime, 0);
 | 
| -  local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly, true);
 | 
| -  local_state->RegisterBooleanPref(prefs::kStabilitySessionEndCompleted, true);
 | 
| -  local_state->RegisterIntegerPref(prefs::kMetricsSessionID, -1);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityCrashCount, 0);
 | 
| +  local_state->RegisterStringPref(prefs::kMetricsClientID,
 | 
| +                                  "",
 | 
| +                                  false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kMetricsClientIDTimestamp,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kStabilityLaunchTimeSec,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kStabilityLastTimestampSec,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterStringPref(prefs::kStabilityStatsVersion,
 | 
| +                                  "",
 | 
| +                                  false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kStabilityStatsBuildTime,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterBooleanPref(prefs::kStabilityExitedCleanly,
 | 
| +                                   true,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterBooleanPref(prefs::kStabilitySessionEndCompleted,
 | 
| +                                   true,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kMetricsSessionID,
 | 
| +                                   -1,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityLaunchCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityCrashCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|    local_state->RegisterIntegerPref(prefs::kStabilityIncompleteSessionEndCount,
 | 
| -                                   0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityExtensionRendererCrashCount,
 | 
| -                                   0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityRendererHangCount, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityChildProcessCrashCount, 0);
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityPageLoadCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityRendererCrashCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(
 | 
| +      prefs::kStabilityExtensionRendererCrashCount,
 | 
| +      0,
 | 
| +      false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityRendererHangCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityChildProcessCrashCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|    local_state->RegisterIntegerPref(prefs::kStabilityBreakpadRegistrationFail,
 | 
| -                                   0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityBreakpadRegistrationSuccess,
 | 
| -                                   0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityDebuggerPresent, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityDebuggerNotPresent, 0);
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(
 | 
| +      prefs::kStabilityBreakpadRegistrationSuccess,
 | 
| +      0,
 | 
| +      false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityDebuggerPresent,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityDebuggerNotPresent,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|  #if defined(OS_CHROMEOS)
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityOtherUserCrashCount, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kStabilityKernelCrashCount, 0);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityOtherUserCrashCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kStabilityKernelCrashCount,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|    local_state->RegisterIntegerPref(prefs::kStabilitySystemUncleanShutdownCount,
 | 
| -                                   0);
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|  #endif  // OS_CHROMEOS
 | 
|  
 | 
| -  local_state->RegisterDictionaryPref(prefs::kProfileMetrics);
 | 
| -  local_state->RegisterIntegerPref(prefs::kNumBookmarksOnBookmarkBar, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kNumFoldersOnBookmarkBar, 0);
 | 
| +  local_state->RegisterDictionaryPref(prefs::kProfileMetrics,
 | 
| +                                      false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kNumBookmarksOnBookmarkBar,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kNumFoldersOnBookmarkBar,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
|    local_state->RegisterIntegerPref(prefs::kNumBookmarksInOtherBookmarkFolder,
 | 
| -                                   0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kNumFoldersInOtherBookmarkFolder, 0);
 | 
| -  local_state->RegisterIntegerPref(prefs::kNumKeywords, 0);
 | 
| -  local_state->RegisterListPref(prefs::kMetricsInitialLogs);
 | 
| -  local_state->RegisterListPref(prefs::kMetricsOngoingLogs);
 | 
| -
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallMetricsPageLoadCount, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallLaunchCount, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallMetricsInstallDate, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallMetricsUptimeSec, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallLastLaunchTimeSec, 0);
 | 
| -  local_state->RegisterInt64Pref(prefs::kUninstallLastObservedRunTimeSec, 0);
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kNumFoldersInOtherBookmarkFolder,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterIntegerPref(prefs::kNumKeywords,
 | 
| +                                   0,
 | 
| +                                   false /* don't sync pref */);
 | 
| +  local_state->RegisterListPref(prefs::kMetricsInitialLogs,
 | 
| +                                false /* don't sync pref */);
 | 
| +  local_state->RegisterListPref(prefs::kMetricsOngoingLogs,
 | 
| +                                false /* don't sync pref */);
 | 
| +
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallMetricsPageLoadCount,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallLaunchCount,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallMetricsInstallDate,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallMetricsUptimeSec,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallLastLaunchTimeSec,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
| +  local_state->RegisterInt64Pref(prefs::kUninstallLastObservedRunTimeSec,
 | 
| +                                 0,
 | 
| +                                 false /* don't sync pref */);
 | 
|  }
 | 
|  
 | 
|  // static
 | 
| 
 |