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

chrome/browser/sync/sync_prefs.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_SYNC_PREFS_H_
 #define CHROME_BROWSER_SYNC_SYNC_PREFS_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 77 matching lines @@
   // Changes are still made to the prefs even if
   // HasKeepEverythingSynced() is true, but won't be visible until
   // SetKeepEverythingSynced(false) is called.
   void SetPreferredDataTypes(
     syncable::ModelTypeSet registered_types,
     syncable::ModelTypeSet preferred_types);
 
   // 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;
   virtual void SetMaxVersion(syncable::ModelType model_type,
                              int64 max_version) OVERRIDE;
 
   // Merges the given set of types with the set of acknowledged types.
   void AcknowledgeSyncedTypes(syncable::ModelTypeSet types);
 
   // content::NotificationObserver implementation.
@@ skipping 41 matching lines @@
   // etc.
   typedef std::map<syncable::ModelType, syncable::ModelTypeSet> PrefGroupsMap;
   PrefGroupsMap pref_groups_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncPrefs);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_SYNC_PREFS_H_