Revert "Eliminate all code related to the AutomaticProfileResetter."

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index db5d644352cbd2c527c00b58398286cdda7c0c88..572804c87fa8253d957d39fb66eb50345a5258c5 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -192,68 +192,58 @@ const char kStaticEncodings[] = "intl.static_encodings";
 const char* const kWebKitScriptsForFontFamilyMaps[] = {
 #define EXPAND_SCRIPT_FONT(x, script_name) script_name ,
 #include "chrome/common/pref_font_script_names-inl.h"
-ALL_FONT_SCRIPTS("unused param")
+    ALL_FONT_SCRIPTS("unused param")
 #undef EXPAND_SCRIPT_FONT
-};
+    };

[gab, 2014/09/05 01:00:19]

git cl format?

Feels this should remain unindented.

[engedy, 2014/09/05 11:45:46]

Argh... yes. I have accidentally the whole thing. Undone.

 
-const size_t kWebKitScriptsForFontFamilyMapsLength =
-    arraysize(kWebKitScriptsForFontFamilyMaps);
+const size_t kWebKitScriptsForFontFamilyMapsLength = arraysize(
+    kWebKitScriptsForFontFamilyMaps);
 
 // Strings for WebKit font family preferences. If these change, the pref prefix
 // in pref_names_util.cc and the pref format in font_settings_api.cc must also
 // change.
 const char kWebKitStandardFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_STANDARD;
+WEBKIT_WEBPREFS_FONTS_STANDARD;
 const char kWebKitFixedFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_FIXED;
+WEBKIT_WEBPREFS_FONTS_FIXED;
 const char kWebKitSerifFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_SERIF;
+WEBKIT_WEBPREFS_FONTS_SERIF;
 const char kWebKitSansSerifFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_SANSERIF;
+WEBKIT_WEBPREFS_FONTS_SANSERIF;
 const char kWebKitCursiveFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_CURSIVE;
+WEBKIT_WEBPREFS_FONTS_CURSIVE;
 const char kWebKitFantasyFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_FANTASY;
+WEBKIT_WEBPREFS_FONTS_FANTASY;
 const char kWebKitPictographFontFamilyMap[] =
-    WEBKIT_WEBPREFS_FONTS_PICTOGRAPH;
+WEBKIT_WEBPREFS_FONTS_PICTOGRAPH;
 const char kWebKitStandardFontFamilyArabic[] =
     "webkit.webprefs.fonts.standard.Arab";
-const char kWebKitFixedFontFamilyArabic[] =
-    "webkit.webprefs.fonts.fixed.Arab";
-const char kWebKitSerifFontFamilyArabic[] =
-    "webkit.webprefs.fonts.serif.Arab";
+const char kWebKitFixedFontFamilyArabic[] = "webkit.webprefs.fonts.fixed.Arab";
+const char kWebKitSerifFontFamilyArabic[] = "webkit.webprefs.fonts.serif.Arab";
 const char kWebKitSansSerifFontFamilyArabic[] =
     "webkit.webprefs.fonts.sansserif.Arab";
 const char kWebKitStandardFontFamilyCyrillic[] =
     "webkit.webprefs.fonts.standard.Cyrl";
-const char kWebKitFixedFontFamilyCyrillic[] =
-    "webkit.webprefs.fonts.fixed.Cyrl";
-const char kWebKitSerifFontFamilyCyrillic[] =
-    "webkit.webprefs.fonts.serif.Cyrl";
+const char kWebKitFixedFontFamilyCyrillic[] = "webkit.webprefs.fonts.fixed.Cyrl";
+const char kWebKitSerifFontFamilyCyrillic[] = "webkit.webprefs.fonts.serif.Cyrl";
 const char kWebKitSansSerifFontFamilyCyrillic[] =
     "webkit.webprefs.fonts.sansserif.Cyrl";
 const char kWebKitStandardFontFamilyGreek[] =
     "webkit.webprefs.fonts.standard.Grek";
-const char kWebKitFixedFontFamilyGreek[] =
-    "webkit.webprefs.fonts.fixed.Grek";
-const char kWebKitSerifFontFamilyGreek[] =
-    "webkit.webprefs.fonts.serif.Grek";
+const char kWebKitFixedFontFamilyGreek[] = "webkit.webprefs.fonts.fixed.Grek";
+const char kWebKitSerifFontFamilyGreek[] = "webkit.webprefs.fonts.serif.Grek";
 const char kWebKitSansSerifFontFamilyGreek[] =
     "webkit.webprefs.fonts.sansserif.Grek";
 const char kWebKitStandardFontFamilyJapanese[] =
     "webkit.webprefs.fonts.standard.Jpan";
-const char kWebKitFixedFontFamilyJapanese[] =
-    "webkit.webprefs.fonts.fixed.Jpan";
-const char kWebKitSerifFontFamilyJapanese[] =
-    "webkit.webprefs.fonts.serif.Jpan";
+const char kWebKitFixedFontFamilyJapanese[] = "webkit.webprefs.fonts.fixed.Jpan";
+const char kWebKitSerifFontFamilyJapanese[] = "webkit.webprefs.fonts.serif.Jpan";
 const char kWebKitSansSerifFontFamilyJapanese[] =
     "webkit.webprefs.fonts.sansserif.Jpan";
 const char kWebKitStandardFontFamilyKorean[] =
     "webkit.webprefs.fonts.standard.Hang";
-const char kWebKitFixedFontFamilyKorean[] =
-    "webkit.webprefs.fonts.fixed.Hang";
-const char kWebKitSerifFontFamilyKorean[] =
-    "webkit.webprefs.fonts.serif.Hang";
+const char kWebKitFixedFontFamilyKorean[] = "webkit.webprefs.fonts.fixed.Hang";
+const char kWebKitSerifFontFamilyKorean[] = "webkit.webprefs.fonts.serif.Hang";
 const char kWebKitSansSerifFontFamilyKorean[] =
     "webkit.webprefs.fonts.sansserif.Hang";
 const char kWebKitCursiveFontFamilyKorean[] =
@@ -294,15 +284,14 @@ const char kWebKitAllowRunningInsecureContent[] =
 const char kWebKitFontScaleFactor[] = "webkit.webprefs.font_scale_factor";
 const char kWebKitForceEnableZoom[] = "webkit.webprefs.force_enable_zoom";
 const char kWebKitPasswordEchoEnabled[] =
-    "webkit.webprefs.password_echo_enabled";
+"webkit.webprefs.password_echo_enabled";
 #endif
 
 const char kWebKitCommonScript[] = "Zyyy";
 const char kWebKitStandardFontFamily[] = "webkit.webprefs.fonts.standard.Zyyy";
 const char kWebKitFixedFontFamily[] = "webkit.webprefs.fonts.fixed.Zyyy";
 const char kWebKitSerifFontFamily[] = "webkit.webprefs.fonts.serif.Zyyy";
-const char kWebKitSansSerifFontFamily[] =
-    "webkit.webprefs.fonts.sansserif.Zyyy";
+const char kWebKitSansSerifFontFamily[] = "webkit.webprefs.fonts.sansserif.Zyyy";
 const char kWebKitCursiveFontFamily[] = "webkit.webprefs.fonts.cursive.Zyyy";
 const char kWebKitFantasyFontFamily[] = "webkit.webprefs.fonts.fantasy.Zyyy";
 const char kWebKitPictographFontFamily[] =
@@ -334,8 +323,7 @@ const char kSafeBrowsingDownloadFeedbackEnabled[] =
 
 // Boolean that is true when SafeBrowsing Malware Report is enabled.
 // TODO(felt): Deprecate. crbug.com/383866
-const char kSafeBrowsingReportingEnabled[] =
-    "safebrowsing.reporting_enabled";
+const char kSafeBrowsingReportingEnabled[] = "safebrowsing.reporting_enabled";
 
 // Boolean that is true when the SafeBrowsing interstitial should not allow
 // users to proceed anyway.
@@ -476,7 +464,7 @@ const char kAudioDevicesMute[] = "settings.audio.devices.mute";
 // A dictionary pref storing the volume settings for all the currently known
 // audio devices.
 const char kAudioDevicesVolumePercent[] =
-    "settings.audio.devices.volume_percent";
+"settings.audio.devices.volume_percent";
 
 // An integer pref to initially mute volume if 1. This pref is ignored if
 // |kAudioOutputAllowed| is set to false, but its value is preserved, therefore
@@ -510,7 +498,7 @@ const char kTapDraggingEnabled[] = "settings.touchpad.enable_tap_dragging";
 
 // A boolean pref set to true if touchpad three-finger-click is enabled.
 const char kEnableTouchpadThreeFingerClick[] =
-    "settings.touchpad.enable_three_finger_click";
+"settings.touchpad.enable_three_finger_click";
 
 // A boolean pref set to true if touchpad natural scrolling is enabled.
 const char kNaturalScroll[] = "settings.touchpad.natural_scroll";
@@ -541,26 +529,26 @@ const char kDisableDriveHostedFiles[] = "gdata.hosted_files.disabled";
 
 // A string pref set to the current input method.
 const char kLanguageCurrentInputMethod[] =
-    "settings.language.current_input_method";
+"settings.language.current_input_method";
 
 // A string pref set to the previous input method.
 const char kLanguagePreviousInputMethod[] =
-    "settings.language.previous_input_method";
+"settings.language.previous_input_method";
 
 // A string pref (comma-separated list) set to the "next engine in menu"
 // hot-key lists.
 const char kLanguageHotkeyNextEngineInMenu[] =
-    "settings.language.hotkey_next_engine_in_menu";
+"settings.language.hotkey_next_engine_in_menu";
 
 // A string pref (comma-separated list) set to the "previous engine"
 // hot-key lists.
 const char kLanguageHotkeyPreviousEngine[] =
-    "settings.language.hotkey_previous_engine";
+"settings.language.hotkey_previous_engine";
 
 // A string pref (comma-separated list) set to the preferred language IDs
 // (ex. "en-US,fr,ko").
 const char kLanguagePreferredLanguages[] =
-    "settings.language.preferred_languages";
+"settings.language.preferred_languages";
 
 // A string pref (comma-separated list) set to the preloaded (active) input
 // method IDs (ex. "pinyin,mozc").
@@ -568,38 +556,38 @@ const char kLanguagePreloadEngines[] = "settings.language.preload_engines";
 
 // A List pref (comma-separated list) set to the extension IMEs to be enabled.
 const char kLanguageEnabledExtensionImes[] =
-    "settings.language.enabled_extension_imes";
+"settings.language.enabled_extension_imes";
 
 // Integer prefs which determine how we remap modifier keys (e.g. swap Alt and
 // Control.) Possible values for these prefs are 0-4. See ModifierKey enum in
 // src/chrome/browser/chromeos/input_method/xkeyboard.h
 const char kLanguageRemapSearchKeyTo[] =
-    // Note: we no longer use XKB for remapping these keys, but we can't change
-    // the pref names since the names are already synced with the cloud.
-    "settings.language.xkb_remap_search_key_to";
+// Note: we no longer use XKB for remapping these keys, but we can't change
+// the pref names since the names are already synced with the cloud.
+"settings.language.xkb_remap_search_key_to";
 const char kLanguageRemapControlKeyTo[] =
-    "settings.language.xkb_remap_control_key_to";
+"settings.language.xkb_remap_control_key_to";
 const char kLanguageRemapAltKeyTo[] =
-    "settings.language.xkb_remap_alt_key_to";
+"settings.language.xkb_remap_alt_key_to";
 const char kLanguageRemapCapsLockKeyTo[] =
-    "settings.language.remap_caps_lock_key_to";
+"settings.language.remap_caps_lock_key_to";
 const char kLanguageRemapDiamondKeyTo[] =
-    "settings.language.remap_diamond_key_to";
+"settings.language.remap_diamond_key_to";
 
 // A boolean pref that causes top-row keys to be interpreted as function keys
 // instead of as media keys.
 const char kLanguageSendFunctionKeys[] =
-    "settings.language.send_function_keys";
+"settings.language.send_function_keys";
 
 // A boolean pref which determines whether key repeat is enabled.
 const char kLanguageXkbAutoRepeatEnabled[] =
-    "settings.language.xkb_auto_repeat_enabled_r2";
+"settings.language.xkb_auto_repeat_enabled_r2";
 // A integer pref which determines key repeat delay (in ms).
 const char kLanguageXkbAutoRepeatDelay[] =
-    "settings.language.xkb_auto_repeat_delay_r2";
+"settings.language.xkb_auto_repeat_delay_r2";
 // A integer pref which determines key repeat interval (in ms).
 const char kLanguageXkbAutoRepeatInterval[] =
-    "settings.language.xkb_auto_repeat_interval_r2";
+"settings.language.xkb_auto_repeat_interval_r2";
 // "_r2" suffixes were added to the three prefs above when we changed the
 // preferences to not be user-configurable or sync with the cloud. The prefs are
 // now user-configurable and syncable again, but we don't want to overwrite the
@@ -607,38 +595,38 @@ const char kLanguageXkbAutoRepeatInterval[] =
 
 // A boolean pref which determines whether the large cursor feature is enabled.
 const char kAccessibilityLargeCursorEnabled[] =
-    "settings.a11y.large_cursor_enabled";
+"settings.a11y.large_cursor_enabled";
 
 // A boolean pref which determines whether the sticky keys feature is enabled.
 const char kAccessibilityStickyKeysEnabled[] =
-    "settings.a11y.sticky_keys_enabled";
+"settings.a11y.sticky_keys_enabled";
 // A boolean pref which determines whether spoken feedback is enabled.
 const char kAccessibilitySpokenFeedbackEnabled[] = "settings.accessibility";
 // A boolean pref which determines whether high conrast is enabled.
 const char kAccessibilityHighContrastEnabled[] =
-    "settings.a11y.high_contrast_enabled";
+"settings.a11y.high_contrast_enabled";
 // A boolean pref which determines whether screen magnifier is enabled.
 const char kAccessibilityScreenMagnifierEnabled[] =
-    "settings.a11y.screen_magnifier";
+"settings.a11y.screen_magnifier";
 // A integer pref which determines what type of screen magnifier is enabled.
 // Note that: 'screen_magnifier_type' had been used as string pref. Hence,
 // we are using another name pref here.
 const char kAccessibilityScreenMagnifierType[] =
-    "settings.a11y.screen_magnifier_type2";
+"settings.a11y.screen_magnifier_type2";
 // A double pref which determines a zooming scale of the screen magnifier.
 const char kAccessibilityScreenMagnifierScale[] =
-    "settings.a11y.screen_magnifier_scale";
+"settings.a11y.screen_magnifier_scale";
 // A boolean pref which determines whether the virtual keyboard is enabled for
 // accessibility.  This feature is separate from displaying an onscreen keyboard
 // due to lack of a physical keyboard.
 const char kAccessibilityVirtualKeyboardEnabled[] =
-    "settings.a11y.virtual_keyboard";
+"settings.a11y.virtual_keyboard";
 // A boolean pref which determines whether autoclick is enabled.
 const char kAccessibilityAutoclickEnabled[] = "settings.a11y.autoclick";
 // An integer pref which determines time in ms between when the mouse cursor
 // stops and when an autoclick is triggered.
 const char kAccessibilityAutoclickDelayMs[] =
-    "settings.a11y.autoclick_delay_ms";
+"settings.a11y.autoclick_delay_ms";
 // A boolean pref which determines whether the accessibility menu shows
 // regardless of the state of a11y features.
 const char kShouldAlwaysShowAccessibilityMenu[] = "settings.a11y.enable_menu";
@@ -646,7 +634,7 @@ const char kShouldAlwaysShowAccessibilityMenu[] = "settings.a11y.enable_menu";
 // A boolean pref which turns on Advanced Filesystem
 // (USB support, SD card, etc).
 const char kLabsAdvancedFilesystemEnabled[] =
-    "settings.labs.advanced_filesystem";
+"settings.labs.advanced_filesystem";
 
 // A boolean pref which turns on the mediaplayer.
 const char kLabsMediaplayerEnabled[] = "settings.labs.mediaplayer";
@@ -656,11 +644,11 @@ const char kEnableAutoScreenLock[] = "settings.enable_screen_lock";
 
 // A boolean pref of whether to show mobile plan notifications.
 const char kShowPlanNotifications[] =
-    "settings.internet.mobile.show_plan_notifications";
+"settings.internet.mobile.show_plan_notifications";
 
 // A boolean pref of whether to show 3G promo notification.
 const char kShow3gPromoNotification[] =
-    "settings.internet.mobile.show_3g_promo_notification";
+"settings.internet.mobile.show_3g_promo_notification";
 
 // A string pref that contains version where "What's new" promo was shown.
 const char kChromeOSReleaseNotesVersion[] = "settings.release_notes.version";
@@ -705,7 +693,7 @@ const char kSessionLengthLimit[] = "session.length_limit";
 // Whether the session length limit should start running only after the first
 // user activity has been observed in a session.
 const char kSessionWaitForInitialUserActivity[] =
-    "session.wait_for_initial_user_activity";
+"session.wait_for_initial_user_activity";
 
 // Inactivity time in milliseconds while the system is on AC power before
 // the screen should be dimmed, turned off, or locked, before an
@@ -720,15 +708,15 @@ const char kPowerAcIdleDelayMs[] = "power.ac_idle_delay_ms";
 
 // Similar delays while the system is on battery power.
 const char kPowerBatteryScreenDimDelayMs[] =
-    "power.battery_screen_dim_delay_ms";
+"power.battery_screen_dim_delay_ms";
 const char kPowerBatteryScreenOffDelayMs[] =
-    "power.battery_screen_off_delay_ms";
+"power.battery_screen_off_delay_ms";
 const char kPowerBatteryScreenLockDelayMs[] =
-    "power.battery_screen_lock_delay_ms";
+"power.battery_screen_lock_delay_ms";
 const char kPowerBatteryIdleWarningDelayMs[] =
-    "power.battery_idle_warning_delay_ms";
+"power.battery_idle_warning_delay_ms";
 const char kPowerBatteryIdleDelayMs[] =
-    "power.battery_idle_delay_ms";
+"power.battery_idle_delay_ms";
 
 // Action that should be performed when the idle delay is reached while the
 // system is on AC power or battery power.
@@ -751,18 +739,18 @@ const char kPowerAllowScreenWakeLocks[] = "power.allow_screen_wake_locks";
 // Amount by which the screen-dim delay should be scaled while the system
 // is in presentation mode. Values are limited to a minimum of 1.0.
 const char kPowerPresentationScreenDimDelayFactor[] =
-    "power.presentation_screen_dim_delay_factor";
+"power.presentation_screen_dim_delay_factor";
 
 // Amount by which the screen-dim delay should be scaled when user activity is
 // observed while the screen is dimmed or soon after the screen has been turned
 // off.  Values are limited to a minimum of 1.0.
 const char kPowerUserActivityScreenDimDelayFactor[] =
-    "power.user_activity_screen_dim_delay_factor";
+"power.user_activity_screen_dim_delay_factor";
 
 // Whether the power management delays should start running only after the first
 // user activity has been observed in a session.
 const char kPowerWaitForInitialUserActivity[] =
-    "power.wait_for_initial_user_activity";
+"power.wait_for_initial_user_activity";
 
 // The URL from which the Terms of Service can be downloaded. The value is only
 // honored for public accounts.
@@ -798,12 +786,12 @@ const char kRAConsentFirstTime[] = "settings.privacy.ra_consent";
 // A boolean pref recording whether user has dismissed the multiprofile
 // itroduction dialog show.
 const char kMultiProfileNeverShowIntro[] =
-    "settings.multi_profile_never_show_intro";
+"settings.multi_profile_never_show_intro";
 
 // A boolean pref recording whether user has dismissed the multiprofile
 // teleport warning dialog show.
 const char kMultiProfileWarningShowDismissed[] =
-    "settings.multi_profile_warning_show_dismissed";
+"settings.multi_profile_warning_show_dismissed";
 
 // A string pref that holds string enum values of how the user should behave
 // in a multiprofile session. See ChromeOsMultiProfileUserBehavior policy
@@ -866,8 +854,7 @@ const char kDeleteCookies[] = "browser.clear_data.cookies";
 const char kDeletePasswords[] = "browser.clear_data.passwords";
 const char kDeleteFormData[] = "browser.clear_data.form_data";
 const char kDeleteHostedAppsData[] = "browser.clear_data.hosted_apps_data";
-const char kDeauthorizeContentLicenses[] =
-    "browser.clear_data.content_licenses";
+const char kDeauthorizeContentLicenses[] = "browser.clear_data.content_licenses";
 const char kDeleteTimePeriod[] = "browser.clear_data.time_period";
 const char kLastClearBrowsingDataTime[] =
     "browser.last_clear_browsing_data_time";
@@ -990,7 +977,7 @@ const char kDefaultBrowserSettingEnabled[] =
 // asking the user to set up automatic updates when Keystone promotion is
 // required.
 const char kShowUpdatePromotionInfoBar[] =
-    "browser.show_update_promotion_info_bar";
+"browser.show_update_promotion_info_bar";
 #endif
 
 // Boolean that is false if we should show window manager decorations.  If
@@ -1081,7 +1068,7 @@ const char kGeolocationEnabled[] = "geolocation.enabled";
 #if defined(ENABLE_GOOGLE_NOW)
 // Boolean that is true when Google services can use the user's location.
 const char kGoogleGeolocationAccessEnabled[] =
-    "googlegeolocationaccess.enabled";
+"googlegeolocationaccess.enabled";
 #endif
 
 // The default audio capture device used by the Media content setting.
@@ -1186,6 +1173,11 @@ const char kSupervisedUserCreationAllowed[] =
 // List pref containing the users supervised by this user.
 const char kSupervisedUsers[] = "profile.managed_users";
 
+// String that indicates that the profile reset prompt has already been shown to
+// the user (profile).
+const char kProfileResetPromptMementoInProfilePrefs[] =
+    "profile.reset_prompt_memento";
+
 // List pref containing the extension ids which are not allowed to send
 // notifications to the message center.
 const char kMessageCenterDisabledExtensionIds[] =
@@ -1282,6 +1274,11 @@ const char kProfileCreatedByVersion[] = "profile.created_by_version";
 // them.
 const char kProfileInfoCache[] = "profile.info_cache";
 
+// Dictionary that maps profile keys to strings that indicate that the profile
+// reset prompt has already been shown to the corresponding user (profile).

[gab, 2014/09/05 01:00:19]

So this means the same thing as the individual per profile prefs? Can you
elaborate in this comment about the need for having both?

[engedy, 2014/09/05 11:45:46]

Done.

+const char kProfileResetPromptMementosInLocalState[] =
+    "profile.reset_prompt_mementos";
+
 // Prefs for SSLConfigServicePref.
 const char kCertRevocationCheckingEnabled[] = "ssl.rev_checking.enabled";
 const char kCertRevocationCheckingRequiredLocalAnchors[] =
@@ -1307,7 +1304,7 @@ const char kMetricsReportingEnabled[] =
 // over the network for analysis.
 #if defined(OS_ANDROID)
 const char kCrashReportingEnabled[] =
-    "user_experience_metrics_crash.reporting_enabled";
+"user_experience_metrics_crash.reporting_enabled";
 #endif
 
 // 64-bit integer serialization of the base::Time from the last successful seed
@@ -1374,23 +1371,23 @@ const char kStabilitySystemUncleanShutdownCount[] =
 // Activity type that is currently in the foreground for the UMA session.
 // Uses the ActivityTypeIds::Type enum.
 const char kStabilityForegroundActivityType[] =
-    "user_experience_metrics.stability.current_foreground_activity_type";
+"user_experience_metrics.stability.current_foreground_activity_type";
 
 // Tracks which Activities were launched during the last session.
 // See |metrics_service_android.cc| for its usage.
 const char kStabilityLaunchedActivityFlags[] =
-    "user_experience_metrics.stability.launched_activity_flags";
+"user_experience_metrics.stability.launched_activity_flags";
 
 // List pref: Counts how many times each Activity was launched.
 // Indexed into by ActivityTypeIds::Type.
 const char kStabilityLaunchedActivityCounts[] =
-    "user_experience_metrics.stability.launched_activity_counts";
+"user_experience_metrics.stability.launched_activity_counts";
 
 // List pref: Counts how many times each Activity type was in the foreground
 // when a UMA session failed to be shut down properly.
 // Indexed into by ActivityTypeIds::Type.
 const char kStabilityCrashedActivityCounts[] =
-    "user_experience_metrics.stability.crashed_activity_counts";
+"user_experience_metrics.stability.crashed_activity_counts";
 #endif
 
 // The keys below are used for the dictionaries in the
@@ -1441,7 +1438,7 @@ const char kDownloadDirUpgraded[] = "download.directory_upgrade";
 #if defined(OS_WIN)
 // Whether downloaded PDFs should be opened in Adobe Acrobat Reader.
 const char kOpenPdfDownloadInAdobeReader[] =
-    "download.open_pdf_in_adobe_reader";
+"download.open_pdf_in_adobe_reader";
 #endif
 
 // String which specifies where to save html files to by default.
@@ -1459,12 +1456,10 @@ const char kSelectFileLastDirectory[] = "selectfile.last_directory";
 const char kAllowFileSelectionDialogs[] = "select_file_dialogs.allowed";
 
 // Map of default tasks, associated by MIME type.
-const char kDefaultTasksByMimeType[] =
-    "filebrowser.tasks.default_by_mime_type";
+const char kDefaultTasksByMimeType[] = "filebrowser.tasks.default_by_mime_type";
 
 // Map of default tasks, associated by file suffix.
-const char kDefaultTasksBySuffix[] =
-    "filebrowser.tasks.default_by_suffix";
+const char kDefaultTasksBySuffix[] = "filebrowser.tasks.default_by_suffix";
 
 // Extensions which should be opened upon completion.
 const char kDownloadExtensionsToOpen[] = "download.extensions_to_open";
@@ -1609,8 +1604,7 @@ const char kDevToolsFileSystemPaths[] = "devtools.file_system_paths";
 const char kDevToolsOpenDocked[] = "devtools.open_docked";
 
 // A boolean specifying whether port forwarding should be enabled.
-const char kDevToolsPortForwardingEnabled[] =
-    "devtools.port_forwarding_enabled";
+const char kDevToolsPortForwardingEnabled[] = "devtools.port_forwarding_enabled";
 
 // A boolean specifying whether default port forwarding configuration has been
 // set.
@@ -1701,8 +1695,7 @@ const char kRemoteAccessHostAllowRelayedConnection[] =
 // String containing the UDP port range that the Chromoting host should used
 // when connecting to clients. The port range should be in the form:
 // <min_port>-<max_port>. E.g. 12400-12409.
-const char kRemoteAccessHostUdpPortRange[] =
-    "remote_access.host_udp_port_range";
+const char kRemoteAccessHostUdpPortRange[] = "remote_access.host_udp_port_range";
 
 // The last used printer and its settings.
 const char kPrintPreviewStickySettings[] =
@@ -1799,7 +1792,7 @@ const char kHotwordPreviousLanguage[] = "hotword.previous_language";
 #if defined(OS_ANDROID)
 // Boolean that controls the global enabled-state of protected media identifier.
 const char kProtectedMediaIdentifierEnabled[] =
-    "protected_media_identifier.enabled";
+"protected_media_identifier.enabled";
 #endif
 
 #if defined(OS_CHROMEOS)
@@ -1814,7 +1807,7 @@ const char kHardwareKeyboardLayout[] = "intl.hardware_keyboard";
 // An integer pref which shows number of times carrier deal promo
 // notification has been shown to user.
 const char kCarrierDealPromoShown[] =
-    "settings.internet.mobile.carrier_deal_promo_shown";
+"settings.internet.mobile.carrier_deal_promo_shown";
 
 // A boolean pref of the auto-enrollment decision. Its value is only valid if
 // it's not the default value; otherwise, no auto-enrollment decision has been
@@ -1866,7 +1859,7 @@ const char kRebootAfterUpdate[] = "automatic_reboot.reboot_after_update";
 // for for getting a cloudprint scoped token to allow printing in Guest mode,
 // Public Accounts and kiosks.
 const char kDeviceRobotAnyApiRefreshToken[] =
-    "device_robot_refresh_token.any-api";
+"device_robot_refresh_token.any-api";
 
 // Device requisition for enterprise enrollment.
 const char kDeviceEnrollmentRequisition[] = "enrollment.device_requisition";
@@ -1921,7 +1914,7 @@ const char kServerBackedDeviceState[] = "server_backed_device_state";
 // URL from customization document to check if wallpaper URL has changed
 // since wallpaper was cached.
 const char kCustomizationDefaultWallpaperURL[] =
-    "customization.default_wallpaper_url";
+"customization.default_wallpaper_url";
 
 // System uptime, when last logout started.
 // This is saved to file and cleared after chrome process starts.
@@ -1931,7 +1924,7 @@ const char kLogoutStartedLast[] = "chromeos.logout-started";
 // meaning of the value is defined in the enum EnrollmentState in:
 //   chrome/browser/chromeos/policy/consumer_management_service.h
 const char kConsumerManagementEnrollmentState[] =
-    "consumer_management.enrollment_state";
+"consumer_management.enrollment_state";
 #endif
 
 // Whether there is a Flash version installed that supports clearing LSO data.
@@ -1956,8 +1949,7 @@ const char kMediaCacheSize[] = "browser.media_cache_size";
 // fetch the correct value from the policy.
 const char kChromeOsReleaseChannel[] = "cros.system.releaseChannel";
 
-const char kPerformanceTracingEnabled[] =
-    "feedback.performance_tracing_enabled";
+const char kPerformanceTracingEnabled[] = "feedback.performance_tracing_enabled";
 
 // Boolean indicating whether tabstrip uses stacked layout (on touch devices).
 // Defaults to false.
@@ -2082,17 +2074,17 @@ const char kUserRemovedLoginItem[] = "background_mode.user_removed_login_item";
 // Set to true if Chrome already created a login item, so there's no need to
 // create another one.
 const char kChromeCreatedLoginItem[] =
-  "background_mode.chrome_created_login_item";
+"background_mode.chrome_created_login_item";
 
 // Set to true once we've initialized kChromeCreatedLoginItem for the first
 // time.
 const char kMigratedLoginItemPref[] =
-  "background_mode.migrated_login_item_pref";
+"background_mode.migrated_login_item_pref";
 
 // A boolean that tracks whether to show a notification when trying to quit
 // while there are apps running.
 const char kNotifyWhenAppsKeepChromeAlive[] =
-    "apps.notify-when-apps-keep-chrome-alive";
+"apps.notify-when-apps-keep-chrome-alive";
 #endif
 
 // Set to true if background mode is enabled on this browser.
@@ -2100,19 +2092,19 @@ const char kBackgroundModeEnabled[] = "background_mode.enabled";
 
 // Set to true if hardware acceleration mode is enabled on this browser.
 const char kHardwareAccelerationModeEnabled[] =
-  "hardware_acceleration_mode.enabled";
+    "hardware_acceleration_mode.enabled";
 
 // Hardware acceleration mode from previous browser launch.
 const char kHardwareAccelerationModePrevious[] =
-  "hardware_acceleration_mode_previous";
+    "hardware_acceleration_mode_previous";
 
 // List of protocol handlers.
 const char kRegisteredProtocolHandlers[] =
-  "custom_handlers.registered_protocol_handlers";
+    "custom_handlers.registered_protocol_handlers";
 
 // List of protocol handlers the user has requested not to be asked about again.
 const char kIgnoredProtocolHandlers[] =
-  "custom_handlers.ignored_protocol_handlers";
+    "custom_handlers.ignored_protocol_handlers";
 
 // List of protocol handlers registered by policy.
 const char kPolicyRegisteredProtocolHandlers[] =
@@ -2188,19 +2180,19 @@ const char kShowLogoutButtonInTray[] = "show_logout_button_in_tray";
 #if defined(USE_AURA)
 // Tuning settings for gestures.
 const char kMaxSeparationForGestureTouchesInPixels[] =
-    "gesture.max_separation_for_gesture_touches_in_pixels";
+"gesture.max_separation_for_gesture_touches_in_pixels";
 const char kSemiLongPressTimeInSeconds[] =
-    "gesture.semi_long_press_time_in_seconds";
+"gesture.semi_long_press_time_in_seconds";
 const char kTabScrubActivationDelayInMS[] =
-    "gesture.tab_scrub_activation_delay_in_ms";
+"gesture.tab_scrub_activation_delay_in_ms";
 const char kFlingAccelerationCurveCoefficient0[] =
-    "gesture.fling_acceleration_curve_coefficient_0";
+"gesture.fling_acceleration_curve_coefficient_0";
 const char kFlingAccelerationCurveCoefficient1[] =
-    "gesture.fling_acceleration_curve_coefficient_1";
+"gesture.fling_acceleration_curve_coefficient_1";
 const char kFlingAccelerationCurveCoefficient2[] =
-    "gesture.fling_acceleration_curve_coefficient_2";
+"gesture.fling_acceleration_curve_coefficient_2";
 const char kFlingAccelerationCurveCoefficient3[] =
-    "gesture.fling_acceleration_curve_coefficient_3";
+"gesture.fling_acceleration_curve_coefficient_3";
 const char kFlingCurveTouchpadAlpha[] = "flingcurve.touchpad_alpha";
 const char kFlingCurveTouchpadBeta[] = "flingcurve.touchpad_beta";
 const char kFlingCurveTouchpadGamma[] = "flingcurve.touchpad_gamma";
@@ -2208,23 +2200,23 @@ const char kFlingCurveTouchscreenAlpha[] = "flingcurve.touchscreen_alpha";
 const char kFlingCurveTouchscreenBeta[] = "flingcurve.touchscreen_beta";
 const char kFlingCurveTouchscreenGamma[] = "flingcurve.touchscreen_gamma";
 const char kFlingMaxCancelToDownTimeInMs[] =
-    "gesture.fling_max_cancel_to_down_time_in_ms";
+"gesture.fling_max_cancel_to_down_time_in_ms";
 const char kFlingMaxTapGapTimeInMs[] =
-    "gesture.fling_max_tap_gap_time_in_ms";
+"gesture.fling_max_tap_gap_time_in_ms";
 const char kOverscrollHorizontalThresholdComplete[] =
-    "overscroll.horizontal_threshold_complete";
+"overscroll.horizontal_threshold_complete";
 const char kOverscrollVerticalThresholdComplete[] =
-    "overscroll.vertical_threshold_complete";
+"overscroll.vertical_threshold_complete";
 const char kOverscrollMinimumThresholdStart[] =
-    "overscroll.minimum_threshold_start";
+"overscroll.minimum_threshold_start";
 const char kOverscrollMinimumThresholdStartTouchpad[] =
-    "overscroll.minimum_threshold_start_touchpad";
+"overscroll.minimum_threshold_start_touchpad";
 const char kOverscrollVerticalThresholdStart[] =
-    "overscroll.vertical_threshold_start";
+"overscroll.vertical_threshold_start";
 const char kOverscrollHorizontalResistThreshold[] =
-    "overscroll.horizontal_resist_threshold";
+"overscroll.horizontal_resist_threshold";
 const char kOverscrollVerticalResistThreshold[] =
-    "overscroll.vertical_resist_threshold";
+"overscroll.vertical_resist_threshold";
 #endif
 
 // Counts how many more times the 'profile on a network share' warning should be
@@ -2259,7 +2251,7 @@ const char kLastAppListAppLaunchPing[] = "app_list.last_app_launch_ping";
 
 // A boolean that tracks whether the user has ever enabled the app launcher.
 const char kAppLauncherHasBeenEnabled[] =
-    "apps.app_launcher.has_been_enabled";
+"apps.app_launcher.has_been_enabled";
 
 // An enum indicating how the app launcher was enabled. E.g., via webstore, app
 // install, command line, etc. For UMA.
@@ -2272,7 +2264,7 @@ const char kAppListEnableTime[] = "app_list.when_enabled";
 // installed.
 // Local state caching knowledge of whether the app launcher is installed.
 const char kAppLauncherIsEnabled[] =
-    "apps.app_launcher.should_show_apps_page";
+"apps.app_launcher.should_show_apps_page";
 
 // Integer representing the version of the app launcher shortcut installed on
 // the system. Incremented, e.g., when embedded icons change.
@@ -2285,7 +2277,7 @@ const char kShowAppLauncherPromo[] = "app_launcher.show_promo";
 // a Drive app id and the value is the corresponding Chrome app id. The pref
 // is unsynable and used to track local mappings only.
 const char kAppLauncherDriveAppMapping[] =
-    "apps.app_launcher.drive_app_mapping";
+"apps.app_launcher.drive_app_mapping";
 #endif
 
 // If set, the user requested to launch the app with this extension id while