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

chrome/browser/sync/sync_prefs.h

Index: chrome/browser/sync/sync_prefs.h
===================================================================
--- chrome/browser/sync/sync_prefs.h	(revision 131686)
+++ chrome/browser/sync/sync_prefs.h	(working copy)
@@ -95,9 +95,17 @@
   // This pref is set outside of sync.
   bool IsManaged() const;
 
+  // Use this encryption bootstrap token once already syncing.
   std::string GetEncryptionBootstrapToken() const;
   void SetEncryptionBootstrapToken(const std::string& token);
 
+#if defined(OS_CHROMEOS)
+  // Use this spare bootstrap token only when setting up sync for the first
+  // time.
+  std::string GetSpareBootstrapToken() const;
+  void SetSpareBootstrapToken(const std::string& token);
+#endif
+
   // InvalidationVersionTracker implementation.
   virtual sync_notifier::InvalidationVersionMap
       GetAllMaxVersions() const OVERRIDE;