[sync] Upstream the Android ProfileSyncService

chrome/browser/sync/glue/session_model_associator.cc

 // Copyright 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/glue/session_model_associator.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 78 matching lines @@
 SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service,
     DataTypeErrorHandler* error_handler)
     : tab_pool_(sync_service),
       local_session_syncid_(syncer::kInvalidId),
       sync_service_(sync_service),
       stale_session_threshold_days_(kDefaultStaleSessionThresholdDays),
       setup_for_test_(false),
       waiting_for_change_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(test_weak_factory_(this)),
       profile_(sync_service->profile()),
-      pref_service_(PrefServiceSyncable::FromProfile(profile_)),
       error_handler_(error_handler) {
   DCHECK(CalledOnValidThread());
   DCHECK(sync_service_);
   DCHECK(profile_);
-  if (pref_service_->FindPreference(kSyncSessionsGUID) == NULL) {
-    static_cast<PrefRegistrySyncable*>(
-        pref_service_->DeprecatedGetPrefRegistry())->RegisterStringPref(
-            kSyncSessionsGUID,
-            std::string(),
-            PrefRegistrySyncable::UNSYNCABLE_PREF);
-  }
 }
 
 SessionModelAssociator::SessionModelAssociator(ProfileSyncService* sync_service,
                                                bool setup_for_test)
     : tab_pool_(sync_service),
       local_session_syncid_(syncer::kInvalidId),
       sync_service_(sync_service),
       stale_session_threshold_days_(kDefaultStaleSessionThresholdDays),
       setup_for_test_(setup_for_test),
       waiting_for_change_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(test_weak_factory_(this)),
       profile_(sync_service->profile()),
-      pref_service_(NULL),
       error_handler_(NULL) {
   DCHECK(CalledOnValidThread());
   DCHECK(sync_service_);
   DCHECK(profile_);
   DCHECK(setup_for_test);
 }
 
 SessionModelAssociator::~SessionModelAssociator() {
   DCHECK(CalledOnValidThread());
 }
@@ skipping 583 matching lines @@
       content::Source<Profile>(sync_service_->profile()),
       content::NotificationService::NoDetails());
   return syncer::SyncError();
 }
 
 void SessionModelAssociator::InitializeCurrentMachineTag(
     syncer::WriteTransaction* trans) {
   DCHECK(CalledOnValidThread());
   DCHECK(current_machine_tag_.empty());
   std::string persisted_guid;
-  if (pref_service_)
-    persisted_guid = pref_service_->GetString(kSyncSessionsGUID);
+  browser_sync::SyncPrefs prefs(profile_->GetPrefs());
+  persisted_guid = prefs.GetSyncSessionsGUID();
   if (!persisted_guid.empty()) {
     current_machine_tag_ = persisted_guid;
     DVLOG(1) << "Restoring persisted session sync guid: "
              << persisted_guid;
   } else {
     current_machine_tag_ = GetMachineTagFromTransaction(trans);
     DVLOG(1) << "Creating session sync guid: " << current_machine_tag_;
-    if (pref_service_)
-      pref_service_->SetString(kSyncSessionsGUID, current_machine_tag_);
+    prefs.SetSyncSessionsGUID(current_machine_tag_);
   }
 
   tab_pool_.set_machine_tag(current_machine_tag_);
 }
 
 bool SessionModelAssociator::GetSyncedFaviconForPageURL(
     const std::string& url,
     std::string* png_favicon) const {
   std::map<std::string, std::string>::const_iterator iter =
       synced_favicon_pages_.find(url);
@@ skipping 505 matching lines @@
 
 bool SessionModelAssociator::CryptoReadyIfNecessary() {
   // We only access the cryptographer while holding a transaction.
   syncer::ReadTransaction trans(FROM_HERE, sync_service_->GetUserShare());
   const syncer::ModelTypeSet encrypted_types = trans.GetEncryptedTypes();
   return !encrypted_types.Has(SESSIONS) ||
          sync_service_->IsCryptographerReady(&trans);
 }
 
 }  // namespace browser_sync