[sync] Upstream the Android ProfileSyncService

chrome/browser/sync/sync_prefs.cc

 // 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.
 
 #include "chrome/browser/sync/sync_prefs.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 82 matching lines @@
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
                                "",
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
 #if defined(OS_CHROMEOS)
   registry->RegisterStringPref(prefs::kSyncSpareBootstrapToken,
                                "",
                                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.
   syncer::ModelTypeSet model_set;
   model_set.Put(syncer::BOOKMARKS);
   model_set.Put(syncer::PREFERENCES);
   model_set.Put(syncer::PASSWORDS);
   model_set.Put(syncer::AUTOFILL_PROFILE);
   model_set.Put(syncer::AUTOFILL);
   model_set.Put(syncer::THEMES);
@@ skipping 167 matching lines @@
       pref_service_ ?
       pref_service_->GetString(prefs::kSyncKeystoreEncryptionBootstrapToken) :
       "";
 }
 
 void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) {
   DCHECK(CalledOnValidThread());
   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) {
     case syncer::BOOKMARKS:
       return prefs::kSyncBookmarks;
     case syncer::PASSWORDS:
       return prefs::kSyncPasswords;
     case syncer::PREFERENCES:
       return prefs::kSyncPreferences;
     case syncer::AUTOFILL:
@@ skipping 153 matching lines @@
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
     else
       types_with_groups.RemoveAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync