Merge 130722 - On ChromeOS, the user is always signed in and we should not

chrome/common/pref_names.cc

Index: chrome/common/pref_names.cc
===================================================================
--- chrome/common/pref_names.cc	(revision 131686)
+++ chrome/common/pref_names.cc	(working copy)
@@ -1651,6 +1651,10 @@
 // The local state pref that stores device activity times before reporting
 // them to the policy server.
 extern const char kDeviceActivityTimes[] = "device_status.activity_times";
+
+// A string that is used to store first-time sync startup after once sync is
+// disabled. This will be refreshed every sign-in.
+const char kSyncSpareBootstrapToken[] = "sync.spare_bootstrap_token";
 #endif
 
 // Whether there is a Flash version installed that supports clearing LSO data.