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

chrome/browser/sync/glue/bookmark_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 65 matching lines @@
   // Associates the given bookmark node with the given sync id.
   virtual void Associate(const BookmarkNode* node, int64 sync_id);
   // Remove the association that corresponds to the given sync id.
   virtual void Disassociate(int64 sync_id);
 
   virtual void AbortAssociation() {
     // No implementation needed, this associator runs on the main
     // 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;
   typedef std::set<int64> DirtyAssociationsSyncIds;
 
   // Posts a task to persist dirty associations.
   void PostPersistAssociationsTask();
   // Persists all dirty associations.
   void PersistAssociations();
 
@@ skipping 11 matching lines @@
   // well known to the server and the client, and is unique within a particular
   // user's share.  For example, "other_bookmarks" is the tag for the Other
   // Bookmarks folder.  The sync nodes are server-created.
   bool AssociateTaggedPermanentNode(const BookmarkNode* permanent_node,
                                     const std::string& tag);
 
   // Compare the properties of a pair of nodes from either domain.
   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_;
   // Stores sync ids for dirty associations.
   DirtyAssociationsSyncIds dirty_associations_sync_ids_;
 
   // Used to post PersistAssociation tasks to the current message loop and
   // guarantees no invocations can occur if |this| has been deleted. (This
   // allows this class to be non-refcounted).
   ScopedRunnableMethodFactory<BookmarkModelAssociator> persist_associations_;
 
   int number_of_new_sync_nodes_created_at_association_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_