Index: chrome/browser/bookmarks/bookmark_model.cc |
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc |
index 9a58709e66ee98f4d63dd95825b7f7da04f323cc..48f313c2e8f4601b38726e76e56f63b33a3157d5 100644 |
--- a/chrome/browser/bookmarks/bookmark_model.cc |
+++ b/chrome/browser/bookmarks/bookmark_model.cc |
@@ -294,7 +294,7 @@ void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) { |
CancelPendingFavIconLoadRequests(AsMutable(node)); |
{ |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.find( |
AsMutable(node)); |
DCHECK(i != nodes_ordered_by_url_set_.end()); |
@@ -321,7 +321,7 @@ bool BookmarkModel::IsLoaded() { |
void BookmarkModel::GetNodesByURL(const GURL& url, |
std::vector<const BookmarkNode*>* nodes) { |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
BookmarkNode tmp_node(url); |
NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.find(&tmp_node); |
while (i != nodes_ordered_by_url_set_.end() && (*i)->GetURL() == url) { |
@@ -342,7 +342,7 @@ const BookmarkNode* BookmarkModel::GetMostRecentlyAddedNodeForURL( |
} |
void BookmarkModel::GetBookmarks(std::vector<GURL>* urls) { |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
const GURL* last_url = NULL; |
for (NodesOrderedByURLSet::iterator i = nodes_ordered_by_url_set_.begin(); |
i != nodes_ordered_by_url_set_.end(); ++i) { |
@@ -355,12 +355,12 @@ void BookmarkModel::GetBookmarks(std::vector<GURL>* urls) { |
} |
bool BookmarkModel::HasBookmarks() { |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
return !nodes_ordered_by_url_set_.empty(); |
} |
bool BookmarkModel::IsBookmarked(const GURL& url) { |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
return IsBookmarkedNoLock(url); |
} |
@@ -417,7 +417,7 @@ const BookmarkNode* BookmarkModel::AddURLWithCreationTime( |
{ |
// Only hold the lock for the duration of the insert. |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
nodes_ordered_by_url_set_.insert(new_node); |
} |
@@ -572,7 +572,7 @@ void BookmarkModel::DoneLoading( |
root_.Add(1, other_node_); |
{ |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
// Update nodes_ordered_by_url_set_ from the nodes. |
PopulateNodesByURL(&root_); |
} |
@@ -600,7 +600,7 @@ void BookmarkModel::RemoveAndDeleteNode(BookmarkNode* delete_me) { |
parent->Remove(index); |
history::URLsStarredDetails details(false); |
{ |
- AutoLock url_lock(url_lock_); |
+ base::AutoLock url_lock(url_lock_); |
RemoveNode(node.get(), &details.changed_urls); |
// RemoveNode adds an entry to changed_urls for each node of type URL. As we |