Index: components/bookmarks/browser/bookmark_model_unittest.cc |
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc |
index 653b20d229f0b31bfa885f057d1ff5e868fc6369..486df6909d5ec1ce318f1bdad1b083fd97f858c0 100644 |
--- a/components/bookmarks/browser/bookmark_model_unittest.cc |
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc |
@@ -145,7 +145,7 @@ class BookmarkModelTest : public testing::Test, |
} |
virtual void BookmarkModelLoaded(BookmarkModel* model, |
- bool ids_reassigned) OVERRIDE { |
+ bool ids_reassigned) override { |
// We never load from the db, so that this should never get invoked. |
NOTREACHED(); |
} |
@@ -154,14 +154,14 @@ class BookmarkModelTest : public testing::Test, |
const BookmarkNode* old_parent, |
int old_index, |
const BookmarkNode* new_parent, |
- int new_index) OVERRIDE { |
+ int new_index) override { |
++moved_count_; |
observer_details_.Set(old_parent, new_parent, old_index, new_index); |
} |
virtual void BookmarkNodeAdded(BookmarkModel* model, |
const BookmarkNode* parent, |
- int index) OVERRIDE { |
+ int index) override { |
++added_count_; |
observer_details_.Set(parent, NULL, index, -1); |
} |
@@ -169,7 +169,7 @@ class BookmarkModelTest : public testing::Test, |
virtual void OnWillRemoveBookmarks(BookmarkModel* model, |
const BookmarkNode* parent, |
int old_index, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
++before_remove_count_; |
} |
@@ -178,55 +178,55 @@ class BookmarkModelTest : public testing::Test, |
const BookmarkNode* parent, |
int old_index, |
const BookmarkNode* node, |
- const std::set<GURL>& removed_urls) OVERRIDE { |
+ const std::set<GURL>& removed_urls) override { |
++removed_count_; |
observer_details_.Set(parent, NULL, old_index, -1); |
} |
virtual void BookmarkNodeChanged(BookmarkModel* model, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
++changed_count_; |
observer_details_.Set(node, NULL, -1, -1); |
} |
virtual void OnWillChangeBookmarkNode(BookmarkModel* model, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
++before_change_count_; |
} |
virtual void BookmarkNodeChildrenReordered( |
BookmarkModel* model, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
++reordered_count_; |
} |
virtual void OnWillReorderBookmarkNode(BookmarkModel* model, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
++before_reorder_count_; |
} |
virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, |
- const BookmarkNode* node) OVERRIDE { |
+ const BookmarkNode* node) override { |
// We never attempt to load favicons, so that this method never |
// gets invoked. |
} |
virtual void ExtensiveBookmarkChangesBeginning( |
- BookmarkModel* model) OVERRIDE { |
+ BookmarkModel* model) override { |
++extensive_changes_beginning_count_; |
} |
- virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE { |
+ virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override { |
++extensive_changes_ended_count_; |
} |
virtual void BookmarkAllUserNodesRemoved( |
BookmarkModel* model, |
- const std::set<GURL>& removed_urls) OVERRIDE { |
+ const std::set<GURL>& removed_urls) override { |
++all_bookmarks_removed_; |
} |
- virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) OVERRIDE { |
+ virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) override { |
++before_remove_all_count_; |
} |