[sync] Upstream the Android ProfileSyncService

chrome/browser/sync/sync_prefs.cc

Index: chrome/browser/sync/sync_prefs.cc
diff --git a/chrome/browser/sync/sync_prefs.cc b/chrome/browser/sync/sync_prefs.cc
index 4a9f430829495a4e6fc92b4eacfc6c9174db01e8..0cccc5520929db55c36d0698a85e6e667dc18483 100644
--- a/chrome/browser/sync/sync_prefs.cc
+++ b/chrome/browser/sync/sync_prefs.cc
@@ -100,6 +100,10 @@ void SyncPrefs::RegisterUserPrefs(PrefService* prefs,
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 #endif
 
+  registry->RegisterStringPref(prefs::kSyncSessionsGUID,
+                               "",
+                               PrefRegistrySyncable::UNSYNCABLE_PREF);
+
   // We will start prompting people about new data types after the launch of
   // SESSIONS - all previously launched data types are treated as if they are
   // already acknowledged.
@@ -287,6 +291,18 @@ void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) {
   pref_service_->SetString(prefs::kSyncKeystoreEncryptionBootstrapToken, token);
 }
 
+std::string SyncPrefs::GetSyncSessionsGUID() const {
+  DCHECK(CalledOnValidThread());
+  return
+      pref_service_ ?
+      pref_service_->GetString(prefs::kSyncSessionsGUID) : "";
+}
+
+void SyncPrefs::SetSyncSessionsGUID(const std::string& guid) {
+  DCHECK(CalledOnValidThread());
+  pref_service_->SetString(prefs::kSyncSessionsGUID, guid);
+}
+
 // static
 const char* SyncPrefs::GetPrefNameForDataType(syncer::ModelType data_type) {
   switch (data_type) {