components/browser_sync/profile_sync_service.cc - Issue 2413313004: [Sync] Move the last things out of core/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/browser_sync/profile_sync_service.cc

Issue 2413313004: [Sync] Move the last things out of core/. (Closed)

Patch Set: Address comments. 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:

Index: components/browser_sync/profile_sync_service.cc

diff --git a/components/browser_sync/profile_sync_service.cc b/components/browser_sync/profile_sync_service.cc

index f33119342e9d23a5222357b5b9c8befc6e410fb0..315e0b3d08742574d5f5bba62569681e2acfbaab 100644

--- a/components/browser_sync/profile_sync_service.cc

+++ b/components/browser_sync/profile_sync_service.cc

@@ -43,10 +43,7 @@

#include "components/sync/base/pref_names.h"

#include "components/sync/base/report_unrecoverable_error.h"

#include "components/sync/base/stop_source.h"

-#include "components/sync/base/sync_db_util.h"

#include "components/sync/base/system_encryptor.h"

-#include "components/sync/core/configure_reason.h"

-#include "components/sync/core/sync_encryption_handler.h"

#include "components/sync/device_info/device_info.h"

#include "components/sync/device_info/device_info_service.h"

#include "components/sync/device_info/device_info_sync_service.h"

@@ -62,10 +59,12 @@

#include "components/sync/driver/sync_type_preference_provider.h"

#include "components/sync/driver/sync_util.h"

#include "components/sync/driver/user_selectable_sync_type.h"

+#include "components/sync/engine/configure_reason.h"

#include "components/sync/engine/cycle/model_neutral_state.h"

#include "components/sync/engine/cycle/type_debug_info_observer.h"

#include "components/sync/engine/net/http_bridge_network_resources.h"

#include "components/sync/engine/net/network_resources.h"

+#include "components/sync/engine/sync_encryption_handler.h"

#include "components/sync/engine/sync_string_conversions.h"

#include "components/sync/js/js_event_details.h"

#include "components/sync/model/model_type_change_processor.h"

@@ -73,6 +72,7 @@

#include "components/sync/model/sync_error.h"

#include "components/sync/protocol/sync.pb.h"

#include "components/sync/syncable/directory.h"

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

#include "components/sync/syncable/syncable_read_transaction.h"

#include "components/sync_sessions/favicon_cache.h"

#include "components/sync_sessions/session_data_type_controller.h"