components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc - Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT]

Unified Diff: components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

Issue 2148293004: [Sync] //components/sync external changes [DO NOT SUBMIT] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@sc-1

Patch Set: Rebase. Created 4 years, 5 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 side-by-side diff with in-line comments

Download patch

« build/all.gyp ('K') | « components/browser_sync/browser/profile_sync_service_autofill_unittest.cc ('k') | components/browser_sync/browser/profile_sync_service_mock.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

diff --git a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

index 91d18cf44702992ac87689bac4347a4a1288cea8..d68f402aee10c1be7bb8fe06337c1b03660285fe 100644

--- a/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

+++ b/components/browser_sync/browser/profile_sync_service_bookmark_unittest.cc

@@ -36,24 +36,24 @@

#include "components/bookmarks/test/bookmark_test_helpers.h"

#include "components/bookmarks/test/test_bookmark_client.h"

#include "components/browser_sync/browser/profile_sync_test_util.h"

+#include "components/sync/api/sync_error.h"

+#include "components/sync/api/sync_merge_result.h"

+#include "components/sync/core/change_record.h"

+#include "components/sync/core/data_type_error_handler.h"

+#include "components/sync/core/read_node.h"

+#include "components/sync/core/read_transaction.h"

+#include "components/sync/core/test/data_type_error_handler_mock.h"

+#include "components/sync/core/test/test_user_share.h"

+#include "components/sync/core/write_node.h"

+#include "components/sync/core/write_transaction.h"

+#include "components/sync/core_impl/syncapi_internal.h"

+#include "components/sync/syncable/mutable_entry.h"

+#include "components/sync/syncable/syncable_id.h"

+#include "components/sync/syncable/syncable_util.h"

+#include "components/sync/syncable/syncable_write_transaction.h"

#include "components/sync_bookmarks/bookmark_change_processor.h"

#include "components/sync_bookmarks/bookmark_model_associator.h"

#include "components/sync_driver/fake_sync_client.h"

-#include "sync/api/sync_error.h"

-#include "sync/api/sync_merge_result.h"

-#include "sync/internal_api/public/change_record.h"

-#include "sync/internal_api/public/data_type_error_handler.h"

-#include "sync/internal_api/public/read_node.h"

-#include "sync/internal_api/public/read_transaction.h"

-#include "sync/internal_api/public/test/data_type_error_handler_mock.h"

-#include "sync/internal_api/public/test/test_user_share.h"

-#include "sync/internal_api/public/write_node.h"

-#include "sync/internal_api/public/write_transaction.h"

-#include "sync/internal_api/syncapi_internal.h"

-#include "sync/syncable/mutable_entry.h"

-#include "sync/syncable/syncable_id.h"

-#include "sync/syncable/syncable_util.h"

-#include "sync/syncable/syncable_write_transaction.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"