bookmarks: Remove Profile getter accessor from BookmarkModel.

chrome/browser/sync/glue/bookmark_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/bookmark_model_associator.h"
 
 #include <stack>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 173 matching lines @@
     AddAll(node->GetChild(i));
 }
 
 const BookmarkNode* BookmarkNodeIdIndex::Find(int64 id) const {
   BookmarkIdMap::const_iterator iter = node_index_.find(id);
   return iter == node_index_.end() ? NULL : iter->second;
 }
 
 BookmarkModelAssociator::BookmarkModelAssociator(
     BookmarkModel* bookmark_model,
+    Profile* profile,
     syncer::UserShare* user_share,
     DataTypeErrorHandler* unrecoverable_error_handler,
     bool expect_mobile_bookmarks_folder)
     : bookmark_model_(bookmark_model),
+      profile_(profile),
       user_share_(user_share),
       unrecoverable_error_handler_(unrecoverable_error_handler),
       expect_mobile_bookmarks_folder_(expect_mobile_bookmarks_folder),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(bookmark_model_);
   DCHECK(user_share_);
   DCHECK(unrecoverable_error_handler_);
 }
 
@@ skipping 286 matching lines @@
       if (child_node)
         Associate(child_node, sync_child_id);
       // All bookmarks are currently modified at association time (even if
       // it doesn't change anything).
       // TODO(sync): introduce logic to only modify the bookmark model if
       // necessary.
       const BookmarkNode* new_child_node =
           BookmarkChangeProcessor::CreateOrUpdateBookmarkNode(
               &sync_child_node,
               bookmark_model_,
+              profile_,
               this);
       if (new_child_node != child_node) {
         local_merge_result->set_num_items_added(
             local_merge_result->num_items_added() + 1);
       } else {
         local_merge_result->set_num_items_modified(
             local_merge_result->num_items_modified() + 1);
       }
       if (sync_child_node.GetIsFolder())
         dfs_stack.push(sync_child_id);
@@ skipping 195 matching lines @@
                                 ModelTypeToHistogramInt(syncer::BOOKMARKS),
                                 syncer::MODEL_TYPE_COUNT);
       // Clear version on bookmark model so that we only report error once.
       bookmark_model_->DeleteNodeMetaInfo(bookmark_model_->root_node(),
                                           kBookmarkTransactionVersionKey);
     }
   }
 }
 
 }  // namespace browser_sync