| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 // TODO(akalin): This file is basically just a unit test for | 5 // TODO(akalin): This file is basically just a unit test for |
| 6 // BookmarkChangeProcessor. Write unit tests for | 6 // BookmarkChangeProcessor. Write unit tests for |
| 7 // BookmarkModelAssociator separately. | 7 // BookmarkModelAssociator separately. |
| 8 | 8 |
| 9 #include <map> | 9 #include <map> |
| 10 #include <queue> | 10 #include <queue> |
| (...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 virtual void ExtensiveBookmarkChangesBeginning( | 229 virtual void ExtensiveBookmarkChangesBeginning( |
| 230 BookmarkModel* model) OVERRIDE { | 230 BookmarkModel* model) OVERRIDE { |
| 231 ++started_count_; | 231 ++started_count_; |
| 232 completed_count_at_started_ = completed_count_; | 232 completed_count_at_started_ = completed_count_; |
| 233 } | 233 } |
| 234 | 234 |
| 235 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE { | 235 virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE { |
| 236 ++completed_count_; | 236 ++completed_count_; |
| 237 } | 237 } |
| 238 | 238 |
| 239 void BookmarkModelChanged() {} | 239 virtual void BookmarkModelChanged() OVERRIDE {} |
| 240 | 240 |
| 241 int get_started() const { | 241 int get_started() const { |
| 242 return started_count_; | 242 return started_count_; |
| 243 } | 243 } |
| 244 | 244 |
| 245 int get_completed_count_at_started() const { | 245 int get_completed_count_at_started() const { |
| 246 return completed_count_at_started_; | 246 return completed_count_at_started_; |
| 247 } | 247 } |
| 248 | 248 |
| 249 int get_completed() const { | 249 int get_completed() const { |
| (...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1832 new_versions[changed_bookmark->id()]); | 1832 new_versions[changed_bookmark->id()]); |
| 1833 initial_versions.erase(changed_bookmark->id()); | 1833 initial_versions.erase(changed_bookmark->id()); |
| 1834 ExpectTransactionVersionMatch(model_->bookmark_bar_node(), initial_versions); | 1834 ExpectTransactionVersionMatch(model_->bookmark_bar_node(), initial_versions); |
| 1835 ExpectTransactionVersionMatch(model_->other_node(), initial_versions); | 1835 ExpectTransactionVersionMatch(model_->other_node(), initial_versions); |
| 1836 ExpectTransactionVersionMatch(model_->mobile_node(), initial_versions); | 1836 ExpectTransactionVersionMatch(model_->mobile_node(), initial_versions); |
| 1837 } | 1837 } |
| 1838 | 1838 |
| 1839 } // namespace | 1839 } // namespace |
| 1840 | 1840 |
| 1841 } // namespace browser_sync | 1841 } // namespace browser_sync |
| OLD | NEW |