| 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 18 matching lines...) Expand all Loading... |
| 29 #include "base/strings/utf_string_conversions.h" | 29 #include "base/strings/utf_string_conversions.h" |
| 30 #include "base/time/time.h" | 30 #include "base/time/time.h" |
| 31 #include "build/build_config.h" | 31 #include "build/build_config.h" |
| 32 #include "components/bookmarks/browser/base_bookmark_model_observer.h" | 32 #include "components/bookmarks/browser/base_bookmark_model_observer.h" |
| 33 #include "components/bookmarks/browser/bookmark_model.h" | 33 #include "components/bookmarks/browser/bookmark_model.h" |
| 34 #include "components/bookmarks/browser/bookmark_utils.h" | 34 #include "components/bookmarks/browser/bookmark_utils.h" |
| 35 #include "components/bookmarks/managed/managed_bookmark_service.h" | 35 #include "components/bookmarks/managed/managed_bookmark_service.h" |
| 36 #include "components/bookmarks/test/bookmark_test_helpers.h" | 36 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 37 #include "components/bookmarks/test/test_bookmark_client.h" | 37 #include "components/bookmarks/test/test_bookmark_client.h" |
| 38 #include "components/browser_sync/browser/profile_sync_test_util.h" | 38 #include "components/browser_sync/browser/profile_sync_test_util.h" |
| 39 #include "components/sync/api/sync_error.h" |
| 40 #include "components/sync/api/sync_merge_result.h" |
| 41 #include "components/sync/core/change_record.h" |
| 42 #include "components/sync/core/data_type_error_handler.h" |
| 43 #include "components/sync/core/read_node.h" |
| 44 #include "components/sync/core/read_transaction.h" |
| 45 #include "components/sync/core/test/data_type_error_handler_mock.h" |
| 46 #include "components/sync/core/test/test_user_share.h" |
| 47 #include "components/sync/core/write_node.h" |
| 48 #include "components/sync/core/write_transaction.h" |
| 49 #include "components/sync/core_impl/syncapi_internal.h" |
| 50 #include "components/sync/syncable/mutable_entry.h" |
| 51 #include "components/sync/syncable/syncable_id.h" |
| 52 #include "components/sync/syncable/syncable_util.h" |
| 53 #include "components/sync/syncable/syncable_write_transaction.h" |
| 39 #include "components/sync_bookmarks/bookmark_change_processor.h" | 54 #include "components/sync_bookmarks/bookmark_change_processor.h" |
| 40 #include "components/sync_bookmarks/bookmark_model_associator.h" | 55 #include "components/sync_bookmarks/bookmark_model_associator.h" |
| 41 #include "components/sync_driver/fake_sync_client.h" | 56 #include "components/sync_driver/fake_sync_client.h" |
| 42 #include "sync/api/sync_error.h" | |
| 43 #include "sync/api/sync_merge_result.h" | |
| 44 #include "sync/internal_api/public/change_record.h" | |
| 45 #include "sync/internal_api/public/data_type_error_handler.h" | |
| 46 #include "sync/internal_api/public/read_node.h" | |
| 47 #include "sync/internal_api/public/read_transaction.h" | |
| 48 #include "sync/internal_api/public/test/data_type_error_handler_mock.h" | |
| 49 #include "sync/internal_api/public/test/test_user_share.h" | |
| 50 #include "sync/internal_api/public/write_node.h" | |
| 51 #include "sync/internal_api/public/write_transaction.h" | |
| 52 #include "sync/internal_api/syncapi_internal.h" | |
| 53 #include "sync/syncable/mutable_entry.h" | |
| 54 #include "sync/syncable/syncable_id.h" | |
| 55 #include "sync/syncable/syncable_util.h" | |
| 56 #include "sync/syncable/syncable_write_transaction.h" | |
| 57 #include "testing/gmock/include/gmock/gmock.h" | 57 #include "testing/gmock/include/gmock/gmock.h" |
| 58 #include "testing/gtest/include/gtest/gtest.h" | 58 #include "testing/gtest/include/gtest/gtest.h" |
| 59 | 59 |
| 60 using bookmarks::BookmarkModel; | 60 using bookmarks::BookmarkModel; |
| 61 using bookmarks::BookmarkNode; | 61 using bookmarks::BookmarkNode; |
| 62 using syncer::BaseNode; | 62 using syncer::BaseNode; |
| 63 using testing::_; | 63 using testing::_; |
| 64 using testing::Return; | 64 using testing::Return; |
| 65 using testing::StrictMock; | 65 using testing::StrictMock; |
| 66 | 66 |
| (...skipping 2518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2585 EXPECT_EQ(syncer::kInvalidId, sync_id); | 2585 EXPECT_EQ(syncer::kInvalidId, sync_id); |
| 2586 | 2586 |
| 2587 // Verify that Sync ignores deleting this node. | 2587 // Verify that Sync ignores deleting this node. |
| 2588 model()->Remove(node); | 2588 model()->Remove(node); |
| 2589 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); | 2589 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); |
| 2590 } | 2590 } |
| 2591 | 2591 |
| 2592 } // namespace | 2592 } // namespace |
| 2593 | 2593 |
| 2594 } // namespace browser_sync | 2594 } // namespace browser_sync |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2130453004:
[Sync] Move //sync to //components/sync. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master