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

chrome/browser/sync/glue/bookmark_model_associator.h

Index: chrome/browser/sync/glue/bookmark_model_associator.h
diff --git a/chrome/browser/sync/glue/bookmark_model_associator.h b/chrome/browser/sync/glue/bookmark_model_associator.h
index 577979f51b8e07ea5b115ac46c233762c6476e5b..51cdff40c80522aa03b6327cb7a6575e658b1555 100644
--- a/chrome/browser/sync/glue/bookmark_model_associator.h
+++ b/chrome/browser/sync/glue/bookmark_model_associator.h
@@ -83,15 +83,14 @@ class BookmarkModelAssociator
     // thread.
   }
 
-  // Returns sync service instance.
-  ProfileSyncService* sync_service() { return sync_service_; }
-
  protected:
   // Stores the id of the node with the given tag in |sync_id|.
   // Returns of that node was found successfully.
   // Tests override this.
   virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id);
 
+  ProfileSyncService* sync_service_;

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

I think you should instead move the sync_service() accessor to the protected
section.

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

Done.

+
  private:
   typedef std::map<int64, int64> BookmarkIdToSyncIdMap;
   typedef std::map<int64, const BookmarkNode*> SyncIdToBookmarkNodeMap;
@@ -123,7 +122,6 @@ class BookmarkModelAssociator
   bool NodesMatch(const BookmarkNode* bookmark,
                   const sync_api::BaseNode* sync_node) const;
 
-  ProfileSyncService* sync_service_;
   UnrecoverableErrorHandler* persist_ids_error_handler_;
   BookmarkIdToSyncIdMap id_map_;
   SyncIdToBookmarkNodeMap id_map_inverse_;