bookmarks: Remove Profile getter accessor from BookmarkModel.

chrome/browser/sync/glue/bookmark_model_associator.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 #define CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_
 
 #include <map>
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_error_handler.h"
 #include "chrome/browser/sync/glue/model_associator.h"
 #include "sync/internal_api/public/util/unrecoverable_error_handler.h"
 
 class BookmarkModel;
 class BookmarkNode;
+class Profile;
 
 namespace syncer {
 class BaseNode;
 class BaseTransaction;
 struct UserShare;
 }
 
 namespace browser_sync {
 
 // Contains all model association related logic:
 // * Algorithm to associate bookmark model and sync model.
 // * Methods to get a bookmark node for a given sync node and vice versa.
 // * Persisting model associations and loading them back.
 class BookmarkModelAssociator
     : public PerDataTypeAssociatorInterface<BookmarkNode, int64> {
  public:
   static syncer::ModelType model_type() { return syncer::BOOKMARKS; }
   // |expect_mobile_bookmarks_folder| controls whether or not we
   // expect the mobile bookmarks permanent folder to be created.
   // Should be set to true only by mobile clients.
   BookmarkModelAssociator(
       BookmarkModel* bookmark_model,
+      Profile* profile_,
       syncer::UserShare* user_share,
       DataTypeErrorHandler* unrecoverable_error_handler,
       bool expect_mobile_bookmarks_folder);
   virtual ~BookmarkModelAssociator();
 
   // Updates the visibility of the permanents node in the BookmarkModel.
   void UpdatePermanentNodeVisibility();
 
   // AssociatorInterface implementation.
   //
@@ skipping 81 matching lines @@
 
   // Compare the properties of a pair of nodes from either domain.
   bool NodesMatch(const BookmarkNode* bookmark,
                   const syncer::BaseNode* sync_node) const;
 
   // Check whether bookmark model and sync model are synced by comparing
   // their transaction versions.
   void CheckModelSyncState() const;
 
   BookmarkModel* bookmark_model_;
+  Profile* profile_;
   syncer::UserShare* user_share_;
   DataTypeErrorHandler* unrecoverable_error_handler_;
   const bool expect_mobile_bookmarks_folder_;
   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).
   base::WeakPtrFactory<BookmarkModelAssociator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkModelAssociator);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_BOOKMARK_MODEL_ASSOCIATOR_H_