[protector] Support for collapsing multiple changes into a single one.

chrome/browser/protector/prefs_backup_invalid_change.cc

Index: chrome/browser/protector/prefs_backup_invalid_change.cc
diff --git a/chrome/browser/protector/prefs_backup_invalid_change.cc b/chrome/browser/protector/prefs_backup_invalid_change.cc
index a9cb8393b081bdcdd8b9ded807f571dbce6a31ef..2d865847efd265b258646aa3f5c0ea33da2f47f3 100644
--- a/chrome/browser/protector/prefs_backup_invalid_change.cc
+++ b/chrome/browser/protector/prefs_backup_invalid_change.cc
@@ -40,6 +40,7 @@ class PrefsBackupInvalidChange : public BasePrefsChange {
   virtual string16 GetBubbleMessage() const OVERRIDE;
   virtual string16 GetApplyButtonText() const OVERRIDE;
   virtual string16 GetDiscardButtonText() const OVERRIDE;
+  virtual bool CanBeMerged() const OVERRIDE;
 
  private:
   virtual ~PrefsBackupInvalidChange();
@@ -100,14 +101,14 @@ int PrefsBackupInvalidChange::GetBubbleIconID() const {
 }
 
 string16 PrefsBackupInvalidChange::GetBubbleTitle() const {
-  return l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_NO_BACKUP_TITLE);
+  return l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_TITLE);
 }
 
 string16 PrefsBackupInvalidChange::GetBubbleMessage() const {
   return startup_pref_reset_ ?
       l10n_util::GetStringUTF16(
           IDS_SETTING_CHANGE_NO_BACKUP_STARTUP_RESET_BUBBLE_MESSAGE) :
-      l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_NO_BACKUP_BUBBLE_MESSAGE);
+      l10n_util::GetStringUTF16(IDS_SETTING_CHANGE_BUBBLE_MESSAGE);
 }
 
 string16 PrefsBackupInvalidChange::GetApplyButtonText() const {
@@ -131,6 +132,10 @@ void PrefsBackupInvalidChange::ApplyDefaults(Profile* profile) {
   }
 }
 
+bool PrefsBackupInvalidChange::CanBeMerged() const {
+  return false;
+}
+
 BaseSettingChange* CreatePrefsBackupInvalidChange() {
   return new PrefsBackupInvalidChange();
 }