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

chrome/browser/sync/profile_sync_service.h

Index: chrome/browser/sync/profile_sync_service.h
===================================================================
--- chrome/browser/sync/profile_sync_service.h	(revision 131686)
+++ chrome/browser/sync/profile_sync_service.h	(working copy)
@@ -625,6 +625,12 @@
       bool sync_everything,
       const syncable::ModelTypeSet chosen_types) const;
 
+#if defined(OS_CHROMEOS)
+  // Refresh spare sync bootstrap token for re-enabling the sync service.
+  // Called on successful sign-in notifications.
+  void RefreshSpareBootstrapToken(const std::string& passphrase);
+#endif
+
   // Factory used to create various dependent objects.
   scoped_ptr<ProfileSyncComponentsFactory> factory_;