| 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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #include "sync/internal_api/public/write_node.h" | 43 #include "sync/internal_api/public/write_node.h" |
| 44 #include "sync/internal_api/public/write_transaction.h" | 44 #include "sync/internal_api/public/write_transaction.h" |
| 45 #include "sync/internal_api/syncapi_internal.h" | 45 #include "sync/internal_api/syncapi_internal.h" |
| 46 #include "sync/syncable/mutable_entry.h" // TODO(tim): Remove. Bug 131130. | 46 #include "sync/syncable/mutable_entry.h" // TODO(tim): Remove. Bug 131130. |
| 47 #include "testing/gmock/include/gmock/gmock.h" | 47 #include "testing/gmock/include/gmock/gmock.h" |
| 48 #include "testing/gtest/include/gtest/gtest.h" | 48 #include "testing/gtest/include/gtest/gtest.h" |
| 49 | 49 |
| 50 namespace browser_sync { | 50 namespace browser_sync { |
| 51 | 51 |
| 52 using bookmarks::BookmarkModel; | 52 using bookmarks::BookmarkModel; |
| 53 using bookmarks::BookmarkNode; |
| 53 using syncer::BaseNode; | 54 using syncer::BaseNode; |
| 54 using testing::_; | 55 using testing::_; |
| 55 using testing::InvokeWithoutArgs; | 56 using testing::InvokeWithoutArgs; |
| 56 using testing::Mock; | 57 using testing::Mock; |
| 57 using testing::StrictMock; | 58 using testing::StrictMock; |
| 58 | 59 |
| 59 #if defined(OS_ANDROID) || defined(OS_IOS) | 60 #if defined(OS_ANDROID) || defined(OS_IOS) |
| 60 static const bool kExpectMobileBookmarks = true; | 61 static const bool kExpectMobileBookmarks = true; |
| 61 #else | 62 #else |
| 62 static const bool kExpectMobileBookmarks = false; | 63 static const bool kExpectMobileBookmarks = false; |
| (...skipping 2123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2186 ExpectModelMatch(); | 2187 ExpectModelMatch(); |
| 2187 | 2188 |
| 2188 // Then simulate the add call arriving late. | 2189 // Then simulate the add call arriving late. |
| 2189 change_processor_->BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0); | 2190 change_processor_->BookmarkNodeAdded(model_, model_->bookmark_bar_node(), 0); |
| 2190 ExpectModelMatch(); | 2191 ExpectModelMatch(); |
| 2191 } | 2192 } |
| 2192 | 2193 |
| 2193 } // namespace | 2194 } // namespace |
| 2194 | 2195 |
| 2195 } // namespace browser_sync | 2196 } // namespace browser_sync |
| OLD | NEW |