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 <stddef.h> | 9 #include <stddef.h> |
10 #include <stdint.h> | 10 #include <stdint.h> |
(...skipping 1586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1597 ASSERT_TRUE(test_user_share()->Reload()); | 1597 ASSERT_TRUE(test_user_share()->Reload()); |
1598 EXPECT_EQ(0u, test_user_share()->GetDeleteJournalSize()); | 1598 EXPECT_EQ(0u, test_user_share()->GetDeleteJournalSize()); |
1599 } | 1599 } |
1600 | 1600 |
1601 struct TestData { | 1601 struct TestData { |
1602 const char* title; | 1602 const char* title; |
1603 const char* url; | 1603 const char* url; |
1604 }; | 1604 }; |
1605 | 1605 |
1606 // Map from bookmark node ID to its version. | 1606 // Map from bookmark node ID to its version. |
1607 typedef std::map<int64_t, int64_t> BookmarkNodeVersionMap; | 1607 using BookmarkNodeVersionMap = std::map<int64_t, int64_t>; |
1608 | 1608 |
1609 // TODO(ncarter): Integrate the existing TestNode/PopulateNodeFromString code | 1609 // TODO(ncarter): Integrate the existing TestNode/PopulateNodeFromString code |
1610 // in the bookmark model unittest, to make it simpler to set up test data | 1610 // in the bookmark model unittest, to make it simpler to set up test data |
1611 // here (and reduce the amount of duplication among tests), and to reduce the | 1611 // here (and reduce the amount of duplication among tests), and to reduce the |
1612 // duplication. | 1612 // duplication. |
1613 class ProfileSyncServiceBookmarkTestWithData | 1613 class ProfileSyncServiceBookmarkTestWithData |
1614 : public ProfileSyncServiceBookmarkTest { | 1614 : public ProfileSyncServiceBookmarkTest { |
1615 public: | 1615 public: |
1616 ProfileSyncServiceBookmarkTestWithData(); | 1616 ProfileSyncServiceBookmarkTestWithData(); |
1617 | 1617 |
(...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2593 EXPECT_EQ(syncer::kInvalidId, sync_id); | 2593 EXPECT_EQ(syncer::kInvalidId, sync_id); |
2594 | 2594 |
2595 // Verify that Sync ignores deleting this node. | 2595 // Verify that Sync ignores deleting this node. |
2596 model()->Remove(node); | 2596 model()->Remove(node); |
2597 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); | 2597 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); |
2598 } | 2598 } |
2599 | 2599 |
2600 } // namespace | 2600 } // namespace |
2601 | 2601 |
2602 } // namespace browser_sync | 2602 } // namespace browser_sync |
OLD | NEW |