| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/bookmarks/browser/bookmark_model.h" | 5 #include "components/bookmarks/browser/bookmark_model.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 int index1_; | 138 int index1_; |
| 139 int index2_; | 139 int index2_; |
| 140 }; | 140 }; |
| 141 | 141 |
| 142 BookmarkModelTest() : model_(client_.CreateModel()) { | 142 BookmarkModelTest() : model_(client_.CreateModel()) { |
| 143 model_->AddObserver(this); | 143 model_->AddObserver(this); |
| 144 ClearCounts(); | 144 ClearCounts(); |
| 145 } | 145 } |
| 146 | 146 |
| 147 virtual void BookmarkModelLoaded(BookmarkModel* model, | 147 virtual void BookmarkModelLoaded(BookmarkModel* model, |
| 148 bool ids_reassigned) OVERRIDE { | 148 bool ids_reassigned) override { |
| 149 // We never load from the db, so that this should never get invoked. | 149 // We never load from the db, so that this should never get invoked. |
| 150 NOTREACHED(); | 150 NOTREACHED(); |
| 151 } | 151 } |
| 152 | 152 |
| 153 virtual void BookmarkNodeMoved(BookmarkModel* model, | 153 virtual void BookmarkNodeMoved(BookmarkModel* model, |
| 154 const BookmarkNode* old_parent, | 154 const BookmarkNode* old_parent, |
| 155 int old_index, | 155 int old_index, |
| 156 const BookmarkNode* new_parent, | 156 const BookmarkNode* new_parent, |
| 157 int new_index) OVERRIDE { | 157 int new_index) override { |
| 158 ++moved_count_; | 158 ++moved_count_; |
| 159 observer_details_.Set(old_parent, new_parent, old_index, new_index); | 159 observer_details_.Set(old_parent, new_parent, old_index, new_index); |
| 160 } | 160 } |
| 161 | 161 |
| 162 virtual void BookmarkNodeAdded(BookmarkModel* model, | 162 virtual void BookmarkNodeAdded(BookmarkModel* model, |
| 163 const BookmarkNode* parent, | 163 const BookmarkNode* parent, |
| 164 int index) OVERRIDE { | 164 int index) override { |
| 165 ++added_count_; | 165 ++added_count_; |
| 166 observer_details_.Set(parent, NULL, index, -1); | 166 observer_details_.Set(parent, NULL, index, -1); |
| 167 } | 167 } |
| 168 | 168 |
| 169 virtual void OnWillRemoveBookmarks(BookmarkModel* model, | 169 virtual void OnWillRemoveBookmarks(BookmarkModel* model, |
| 170 const BookmarkNode* parent, | 170 const BookmarkNode* parent, |
| 171 int old_index, | 171 int old_index, |
| 172 const BookmarkNode* node) OVERRIDE { | 172 const BookmarkNode* node) override { |
| 173 ++before_remove_count_; | 173 ++before_remove_count_; |
| 174 } | 174 } |
| 175 | 175 |
| 176 virtual void BookmarkNodeRemoved( | 176 virtual void BookmarkNodeRemoved( |
| 177 BookmarkModel* model, | 177 BookmarkModel* model, |
| 178 const BookmarkNode* parent, | 178 const BookmarkNode* parent, |
| 179 int old_index, | 179 int old_index, |
| 180 const BookmarkNode* node, | 180 const BookmarkNode* node, |
| 181 const std::set<GURL>& removed_urls) OVERRIDE { | 181 const std::set<GURL>& removed_urls) override { |
| 182 ++removed_count_; | 182 ++removed_count_; |
| 183 observer_details_.Set(parent, NULL, old_index, -1); | 183 observer_details_.Set(parent, NULL, old_index, -1); |
| 184 } | 184 } |
| 185 | 185 |
| 186 virtual void BookmarkNodeChanged(BookmarkModel* model, | 186 virtual void BookmarkNodeChanged(BookmarkModel* model, |
| 187 const BookmarkNode* node) OVERRIDE { | 187 const BookmarkNode* node) override { |
| 188 ++changed_count_; | 188 ++changed_count_; |
| 189 observer_details_.Set(node, NULL, -1, -1); | 189 observer_details_.Set(node, NULL, -1, -1); |
| 190 } | 190 } |
| 191 | 191 |
| 192 virtual void OnWillChangeBookmarkNode(BookmarkModel* model, | 192 virtual void OnWillChangeBookmarkNode(BookmarkModel* model, |
| 193 const BookmarkNode* node) OVERRIDE { | 193 const BookmarkNode* node) override { |
| 194 ++before_change_count_; | 194 ++before_change_count_; |
| 195 } | 195 } |
| 196 | 196 |
| 197 virtual void BookmarkNodeChildrenReordered( | 197 virtual void BookmarkNodeChildrenReordered( |
| 198 BookmarkModel* model, | 198 BookmarkModel* model, |
| 199 const BookmarkNode* node) OVERRIDE { | 199 const BookmarkNode* node) override { |
| 200 ++reordered_count_; | 200 ++reordered_count_; |
| 201 } | 201 } |
| 202 | 202 |
| 203 virtual void OnWillReorderBookmarkNode(BookmarkModel* model, | 203 virtual void OnWillReorderBookmarkNode(BookmarkModel* model, |
| 204 const BookmarkNode* node) OVERRIDE { | 204 const BookmarkNode* node) override { |
| 205 ++before_reorder_count_; | 205 ++before_reorder_count_; |
| 206 } | 206 } |
| 207 | 207 |
| 208 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, | 208 virtual void BookmarkNodeFaviconChanged(BookmarkModel* model, |
| 209 const BookmarkNode* node) OVERRIDE { | 209 const BookmarkNode* node) override { |
| 210 // We never attempt to load favicons, so that this method never | 210 // We never attempt to load favicons, so that this method never |
| 211 // gets invoked. | 211 // gets invoked. |
| 212 } | 212 } |
| 213 | 213 |
| 214 virtual void ExtensiveBookmarkChangesBeginning( | 214 virtual void ExtensiveBookmarkChangesBeginning( |
| 215 BookmarkModel* model) OVERRIDE { | 215 BookmarkModel* model) override { |
| 216 ++extensive_changes_beginning_count_; | 216 ++extensive_changes_beginning_count_; |
| 217 } | 217 } |
| 218 | 218 |
| 219 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE { | 219 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override { |
| 220 ++extensive_changes_ended_count_; | 220 ++extensive_changes_ended_count_; |
| 221 } | 221 } |
| 222 | 222 |
| 223 virtual void BookmarkAllUserNodesRemoved( | 223 virtual void BookmarkAllUserNodesRemoved( |
| 224 BookmarkModel* model, | 224 BookmarkModel* model, |
| 225 const std::set<GURL>& removed_urls) OVERRIDE { | 225 const std::set<GURL>& removed_urls) override { |
| 226 ++all_bookmarks_removed_; | 226 ++all_bookmarks_removed_; |
| 227 } | 227 } |
| 228 | 228 |
| 229 virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) OVERRIDE { | 229 virtual void OnWillRemoveAllUserBookmarks(BookmarkModel* model) override { |
| 230 ++before_remove_all_count_; | 230 ++before_remove_all_count_; |
| 231 } | 231 } |
| 232 | 232 |
| 233 void ClearCounts() { | 233 void ClearCounts() { |
| 234 added_count_ = moved_count_ = removed_count_ = changed_count_ = | 234 added_count_ = moved_count_ = removed_count_ = changed_count_ = |
| 235 reordered_count_ = extensive_changes_beginning_count_ = | 235 reordered_count_ = extensive_changes_beginning_count_ = |
| 236 extensive_changes_ended_count_ = all_bookmarks_removed_ = | 236 extensive_changes_ended_count_ = all_bookmarks_removed_ = |
| 237 before_remove_count_ = before_change_count_ = before_reorder_count_ = | 237 before_remove_count_ = before_change_count_ = before_reorder_count_ = |
| 238 before_remove_all_count_ = 0; | 238 before_remove_all_count_ = 0; |
| 239 } | 239 } |
| (...skipping 956 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1196 EXPECT_FALSE(node.DeleteMetaInfo("key3")); | 1196 EXPECT_FALSE(node.DeleteMetaInfo("key3")); |
| 1197 EXPECT_FALSE(node.GetMetaInfo("key1", &out_value)); | 1197 EXPECT_FALSE(node.GetMetaInfo("key1", &out_value)); |
| 1198 EXPECT_FALSE(node.GetMetaInfo("key2.subkey1", &out_value)); | 1198 EXPECT_FALSE(node.GetMetaInfo("key2.subkey1", &out_value)); |
| 1199 EXPECT_FALSE(node.GetMetaInfo("key2.subkey2", &out_value)); | 1199 EXPECT_FALSE(node.GetMetaInfo("key2.subkey2", &out_value)); |
| 1200 EXPECT_FALSE(node.GetMetaInfo("key2.subkey2.leaf", &out_value)); | 1200 EXPECT_FALSE(node.GetMetaInfo("key2.subkey2.leaf", &out_value)); |
| 1201 EXPECT_FALSE(node.GetMetaInfoMap()); | 1201 EXPECT_FALSE(node.GetMetaInfoMap()); |
| 1202 } | 1202 } |
| 1203 | 1203 |
| 1204 } // namespace | 1204 } // namespace |
| 1205 } // namespace bookmarks | 1205 } // namespace bookmarks |
| OLD | NEW |