Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(35)

Side by Side Diff: components/browser_sync/profile_sync_service_bookmark_unittest.cc

Issue 2401223002: [Sync] Renaming sync/api* to sync/model*. (Closed)
Patch Set: Missed a comment in a DEPS file, and rebasing. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 19 matching lines...) Expand all
30 #include "base/test/test_message_loop.h" 30 #include "base/test/test_message_loop.h"
31 #include "base/time/time.h" 31 #include "base/time/time.h"
32 #include "build/build_config.h" 32 #include "build/build_config.h"
33 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 33 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
34 #include "components/bookmarks/browser/bookmark_model.h" 34 #include "components/bookmarks/browser/bookmark_model.h"
35 #include "components/bookmarks/browser/bookmark_utils.h" 35 #include "components/bookmarks/browser/bookmark_utils.h"
36 #include "components/bookmarks/managed/managed_bookmark_service.h" 36 #include "components/bookmarks/managed/managed_bookmark_service.h"
37 #include "components/bookmarks/test/bookmark_test_helpers.h" 37 #include "components/bookmarks/test/bookmark_test_helpers.h"
38 #include "components/bookmarks/test/test_bookmark_client.h" 38 #include "components/bookmarks/test/test_bookmark_client.h"
39 #include "components/browser_sync/profile_sync_test_util.h" 39 #include "components/browser_sync/profile_sync_test_util.h"
40 #include "components/sync/api/data_type_error_handler.h"
41 #include "components/sync/api/data_type_error_handler_mock.h"
42 #include "components/sync/api/sync_error.h"
43 #include "components/sync/api/sync_merge_result.h"
44 #include "components/sync/core/change_record.h" 40 #include "components/sync/core/change_record.h"
45 #include "components/sync/core/read_node.h" 41 #include "components/sync/core/read_node.h"
46 #include "components/sync/core/read_transaction.h" 42 #include "components/sync/core/read_transaction.h"
47 #include "components/sync/core/test/test_user_share.h" 43 #include "components/sync/core/test/test_user_share.h"
48 #include "components/sync/core/write_node.h" 44 #include "components/sync/core/write_node.h"
49 #include "components/sync/core/write_transaction.h" 45 #include "components/sync/core/write_transaction.h"
50 #include "components/sync/core_impl/syncapi_internal.h" 46 #include "components/sync/core_impl/syncapi_internal.h"
51 #include "components/sync/driver/fake_sync_client.h" 47 #include "components/sync/driver/fake_sync_client.h"
48 #include "components/sync/model/data_type_error_handler.h"
49 #include "components/sync/model/data_type_error_handler_mock.h"
50 #include "components/sync/model/sync_error.h"
51 #include "components/sync/model/sync_merge_result.h"
52 #include "components/sync/syncable/mutable_entry.h" 52 #include "components/sync/syncable/mutable_entry.h"
53 #include "components/sync/syncable/syncable_id.h" 53 #include "components/sync/syncable/syncable_id.h"
54 #include "components/sync/syncable/syncable_util.h" 54 #include "components/sync/syncable/syncable_util.h"
55 #include "components/sync/syncable/syncable_write_transaction.h" 55 #include "components/sync/syncable/syncable_write_transaction.h"
56 #include "components/sync_bookmarks/bookmark_change_processor.h" 56 #include "components/sync_bookmarks/bookmark_change_processor.h"
57 #include "components/sync_bookmarks/bookmark_model_associator.h" 57 #include "components/sync_bookmarks/bookmark_model_associator.h"
58 #include "testing/gmock/include/gmock/gmock.h" 58 #include "testing/gmock/include/gmock/gmock.h"
59 #include "testing/gtest/include/gtest/gtest.h" 59 #include "testing/gtest/include/gtest/gtest.h"
60 60
61 using bookmarks::BookmarkModel; 61 using bookmarks::BookmarkModel;
(...skipping 2530 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 EXPECT_EQ(syncer::kInvalidId, sync_id); 2592 EXPECT_EQ(syncer::kInvalidId, sync_id);
2593 2593
2594 // Verify that Sync ignores deleting this node. 2594 // Verify that Sync ignores deleting this node.
2595 model()->Remove(node); 2595 model()->Remove(node);
2596 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount()); 2596 EXPECT_EQ(sync_bookmark_count, GetSyncBookmarkCount());
2597 } 2597 }
2598 2598
2599 } // namespace 2599 } // namespace
2600 2600
2601 } // namespace browser_sync 2601 } // namespace browser_sync
OLDNEW
« no previous file with comments | « components/browser_sync/profile_sync_service.cc ('k') | components/browser_sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698