[protector] Added UI for invalid Preferences backup case.

chrome/browser/prefs/session_startup_pref.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/prefs/session_startup_pref.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/net/url_fixer_upper.h"
@@ skipping 44 matching lines @@
       GURL fixed_url = URLFixerUpper::FixupURL(url_text, "");
       pref->urls.push_back(fixed_url);
     }
   }
 }
 
 }  // namespace
 
 // static
 void SessionStartupPref::RegisterUserPrefs(PrefService* prefs) {
+  prefs->RegisterIntegerPref(prefs::kRestoreOnStartup,
+                             TypeToPrefValue(GetDefaultStartupType()),
+                             PrefService::SYNCABLE_PREF);
+  prefs->RegisterListPref(prefs::kURLsToRestoreOnStartup,
+                          PrefService::SYNCABLE_PREF);
+}
+
+// static
+SessionStartupPref::Type SessionStartupPref::GetDefaultStartupType() {
 #if defined(OS_CHROMEOS)
   SessionStartupPref::Type type = SessionStartupPref::LAST;
 #else
   SessionStartupPref::Type type = SessionStartupPref::DEFAULT;
 #endif
 
 #if defined(OS_MACOSX)
   // Use Lion's system preference, if it is set.
   if (restore_utils::IsWindowRestoreEnabled())
     type = SessionStartupPref::LAST;
 #endif
 
-  prefs->RegisterIntegerPref(prefs::kRestoreOnStartup,
-                             TypeToPrefValue(type),
-                             PrefService::SYNCABLE_PREF);
-  prefs->RegisterListPref(prefs::kURLsToRestoreOnStartup,
-                          PrefService::SYNCABLE_PREF);
+  return type;
 }
 
 // static
 void SessionStartupPref::SetStartupPref(
     Profile* profile,
     const SessionStartupPref& pref) {
   DCHECK(profile);
   SetStartupPref(profile->GetPrefs(), pref);
 }
 
@@ skipping 110 matching lines @@
   CHECK(prefs_watcher->GetBackupForPref(
             prefs::kURLsToRestoreOnStartup)->GetAsList(&url_list));
   URLListToPref(url_list, &backup_pref);
 
   return backup_pref;
 }
 
 SessionStartupPref::SessionStartupPref(Type type) : type(type) {}
 
 SessionStartupPref::~SessionStartupPref() {}