[Sync] Refactored ProfileSyncService and remove its backend() function

chrome/browser/sync/glue/autofill_model_associator.cc

 // Copyright (c) 2010 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/autofill_model_associator.h"
 
 #include <functional>
 #include <vector>
 
 #include "base/task.h"
@@ skipping 133 matching lines @@
   std::vector<AutofillEntry> entries;
   ScopedVector<AutoFillProfile> profiles;
 
   if (!LoadAutofillData(&entries, &profiles.get())) {
     LOG(ERROR) << "Could not get the autofill data from WebDatabase.";
     return false;
   }
 
   DataBundle bundle;
   {
-    sync_api::WriteTransaction trans(
-        sync_service_->backend()->GetUserShareHandle());
+    sync_api::WriteTransaction trans(sync_service_->GetUserShareHandle());

[tim (not reviewing), 2011/01/21 18:17:00]

Maybe what I was thinking before, since the handle never changes, was to pass it
in the ctor or via a set_ method? Anything we can trim off of the PSS interface
is a win IMO.

What we really need is an abstract model associator since there's so much
duplicated code (and the share handle could be stored in there).

[akalin, 2011/01/21 21:21:09]

Yeah, I agree.  I actually tried going down that path and it got pretty
monstrous.  I settled for removing the backend() accessor and temporarily adding
these functions.  I added TODOs for what needs to be done for all the functions
I added to PSS.

 
     sync_api::ReadNode autofill_root(&trans);
     if (!autofill_root.InitByTagLookup(kAutofillTag)) {
       LOG(ERROR) << "Server did not create the top-level autofill node. We "
                  << "might be running against an out-of-date server.";
       return false;
     }
 
     if (!TraverseAndAssociateChromeAutofillEntries(&trans, autofill_root,
         entries, &bundle.current_entries, &bundle.new_entries)) {
@@ skipping 12 matching lines @@
   // Since we're on the DB thread, we don't have to worry about updating
   // the autofill database after closing the write transaction, since
   // this is the only thread that writes to the database.  We also don't have
   // to worry about the sync model getting out of sync, because changes are
   // propogated to the ChangeProcessor on this thread.
   if (!SaveChangesToWebData(bundle)) {
     LOG(ERROR) << "Failed to update autofill entries.";
     return false;
   }
 
-  if (sync_service_->backend()->GetAutofillMigrationState() !=
+  if (sync_service_->GetAutofillMigrationState() !=
       syncable::MIGRATED) {
     syncable::AutofillMigrationDebugInfo debug_info;
     debug_info.autofill_entries_added_during_migration =
         number_of_entries_created_;
-    sync_service_->backend()->SetAutofillMigrationDebugInfo(
+    sync_service_->SetAutofillMigrationDebugInfo(
         syncable::AutofillMigrationDebugInfo::ENTRIES_ADDED,
         debug_info);
   }
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       new DoOptimisticRefreshForAutofill(personal_data_));
   return true;
 }
 
 bool AutofillModelAssociator::SaveChangesToWebData(const DataBundle& bundle) {
@@ skipping 172 matching lines @@
 
 bool AutofillModelAssociator::SyncModelHasUserCreatedNodes(bool* has_nodes) {
   DCHECK(has_nodes);
   *has_nodes = false;
   int64 autofill_sync_id;
   if (!GetSyncIdForTaggedNode(kAutofillTag, &autofill_sync_id)) {
     LOG(ERROR) << "Server did not create the top-level autofill node. We "
                << "might be running against an out-of-date server.";
     return false;
   }
-  sync_api::ReadTransaction trans(
-      sync_service_->backend()->GetUserShareHandle());
+  sync_api::ReadTransaction trans(sync_service_->GetUserShareHandle());
 
   sync_api::ReadNode autofill_node(&trans);
   if (!autofill_node.InitByIdLookup(autofill_sync_id)) {
     LOG(ERROR) << "Server did not create the top-level autofill node. We "
                << "might be running against an out-of-date server.";
     return false;
   }
 
   // The sync model has user created nodes if the autofill folder has any
   // children.
@@ skipping 39 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   SyncIdToAutofillMap::iterator iter = id_map_inverse_.find(sync_id);
   if (iter == id_map_inverse_.end())
     return;
   CHECK(id_map_.erase(iter->second));
   id_map_inverse_.erase(iter);
 }
 
 bool AutofillModelAssociator::GetSyncIdForTaggedNode(const std::string& tag,
                                                      int64* sync_id) {
-  sync_api::ReadTransaction trans(
-      sync_service_->backend()->GetUserShareHandle());
+  sync_api::ReadTransaction trans(sync_service_->GetUserShareHandle());
   sync_api::ReadNode sync_node(&trans);
   if (!sync_node.InitByTagLookup(tag.c_str()))
     return false;
   *sync_id = sync_node.GetId();
   return true;
 }
 
 bool AutofillModelAssociator::IsAbortPending() {
   base::AutoLock lock(abort_association_pending_lock_);
   return abort_association_pending_;
@@ skipping 67 matching lines @@
   diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
       || diff;
   return diff;
 }
 
 bool AutofillModelAssociator::HasNotMigratedYet(
     const sync_api::BaseTransaction* trans) {
 
   // Now read the current value from the directory.
   syncable::AutofillMigrationState autofill_migration_state =
-      sync_service()->backend()->GetAutofillMigrationState();
+      sync_service_->GetAutofillMigrationState();
 
   DCHECK_NE(autofill_migration_state, syncable::NOT_DETERMINED);
 
   if (autofill_migration_state== syncable::NOT_DETERMINED) {
     VLOG(1) << "Autofill migration state is not determined inside "
             << " model associator";
   }
 
   if (autofill_migration_state == syncable::NOT_MIGRATED) {
     return true;
   }
 
   if (autofill_migration_state == syncable::INSUFFICIENT_INFO_TO_DETERMINE) {
       VLOG(1) << "[AUTOFILL MIGRATION]"
               << "current autofill migration state is insufficient info to"
               << "determine.";
       sync_api::ReadNode autofill_profile_root_node(trans);
       if (!autofill_profile_root_node.InitByTagLookup(
           browser_sync::kAutofillProfileTag) ||
           autofill_profile_root_node.GetFirstChildId()==
             static_cast<int64>(0)) {
-        sync_service()->backend()->SetAutofillMigrationState(
+        sync_service_->SetAutofillMigrationState(
             syncable::NOT_MIGRATED);
 
         VLOG(1) << "[AUTOFILL MIGRATION]"
                 << "Current autofill migration state is NOT Migrated because"
                 << "legacy autofill root node is present whereas new "
                 << "Autofill profile root node is absent.";
         return true;
       }
 
-      sync_service()->backend()->SetAutofillMigrationState(syncable::MIGRATED);
+      sync_service_->SetAutofillMigrationState(syncable::MIGRATED);
 
       VLOG(1) << "[AUTOFILL MIGRATION]"
               << "Current autofill migration state is migrated.";
   }
 
   return false;
 }
 
 }  // namespace browser_sync