UI flow rework for device reset options. Reset made available from gaia screen. Tests adapted.

chrome/common/pref_names.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/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 1956 matching lines @@
 const char kPerformanceTracingEnabled[] =
     "feedback.performance_tracing_enabled";
 
 // Boolean indicating whether tabstrip uses stacked layout (on touch devices).
 // Defaults to false.
 const char kTabStripStackedLayout[] = "tab-strip-stacked-layout";
 
 // Indicates that factory reset was requested from options page or reset screen.
 const char kFactoryResetRequested[] = "FactoryResetRequested";
 
-// Indicates that rollback was requested alongside with factory reset.
-// Makes sense only if kFactoryResetRequested is true.
-const char kRollbackRequested[] = "RollbackRequested";
-
 // Boolean recording whether we have showed a balloon that calls out the message
 // center for desktop notifications.
 const char kMessageCenterShowedFirstRunBalloon[] =
     "message_center.showed_first_run_balloon";
 
 // Boolean recording whether the user has disabled the notifications
 // menubar or systray icon.
 const char kMessageCenterShowIcon[] = "message_center.show_icon";
 
 const char kMessageCenterForcedOnTaskbar[] =
@@ skipping 345 matching lines @@
 const char kPartnerBookmarkMappings[] = "partnerbookmarks.mappings";
 #endif
 
 // Whether DNS Quick Check is disabled in proxy resolution.
 const char kQuickCheckEnabled[] = "proxy.quick_check_enabled";
 
 // Whether Guest Mode is enabled within the browser.
 const char kBrowserGuestModeEnabled[] = "profile.browser_guest_enabled";
 
 }  // namespace prefs