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

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

Issue 2203673002: [Sync] Move //components/sync_driver to //components/sync/driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sd-a
Patch Set: Full change rebased on static lib. Created 4 years, 4 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 29 matching lines...) Expand all
40 #include "components/sync/api/sync_merge_result.h" 40 #include "components/sync/api/sync_merge_result.h"
41 #include "components/sync/core/change_record.h" 41 #include "components/sync/core/change_record.h"
42 #include "components/sync/core/data_type_error_handler.h" 42 #include "components/sync/core/data_type_error_handler.h"
43 #include "components/sync/core/read_node.h" 43 #include "components/sync/core/read_node.h"
44 #include "components/sync/core/read_transaction.h" 44 #include "components/sync/core/read_transaction.h"
45 #include "components/sync/core/test/data_type_error_handler_mock.h" 45 #include "components/sync/core/test/data_type_error_handler_mock.h"
46 #include "components/sync/core/test/test_user_share.h" 46 #include "components/sync/core/test/test_user_share.h"
47 #include "components/sync/core/write_node.h" 47 #include "components/sync/core/write_node.h"
48 #include "components/sync/core/write_transaction.h" 48 #include "components/sync/core/write_transaction.h"
49 #include "components/sync/core_impl/syncapi_internal.h" 49 #include "components/sync/core_impl/syncapi_internal.h"
50 #include "components/sync/driver/fake_sync_client.h"
50 #include "components/sync/syncable/mutable_entry.h" 51 #include "components/sync/syncable/mutable_entry.h"
51 #include "components/sync/syncable/syncable_id.h" 52 #include "components/sync/syncable/syncable_id.h"
52 #include "components/sync/syncable/syncable_util.h" 53 #include "components/sync/syncable/syncable_util.h"
53 #include "components/sync/syncable/syncable_write_transaction.h" 54 #include "components/sync/syncable/syncable_write_transaction.h"
54 #include "components/sync_bookmarks/bookmark_change_processor.h" 55 #include "components/sync_bookmarks/bookmark_change_processor.h"
55 #include "components/sync_bookmarks/bookmark_model_associator.h" 56 #include "components/sync_bookmarks/bookmark_model_associator.h"
56 #include "components/sync_driver/fake_sync_client.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
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
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698