chrome/browser/sync/glue/sync_backend_host_core.cc - Issue 594643003: Device info datatype should be moved to components/sync_driver.

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: chrome/browser/sync/glue/sync_backend_host_core.cc

Issue 594643003: Device info datatype should be moved to components/sync_driver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed dependencies in ui_thread_search_terms_data.cc Created 6 years, 3 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

« chrome/browser/sync/glue/device_info.cc ('K') | « chrome/browser/sync/glue/local_device_info_provider_unittest.cc ('k') | chrome/browser/sync/sessions/sessions_sync_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/sync_backend_host_core.cc

diff --git a/chrome/browser/sync/glue/sync_backend_host_core.cc b/chrome/browser/sync/glue/sync_backend_host_core.cc

index b8c66df222b4d8516fd672e37af4c89dd3a5ca33..1827f514cb246d4d66c1829ccd0176d98fd03281 100644

--- a/chrome/browser/sync/glue/sync_backend_host_core.cc

+++ b/chrome/browser/sync/glue/sync_backend_host_core.cc

@@ -6,8 +6,8 @@

#include "base/files/file_util.h"

#include "base/metrics/histogram.h"

-#include "chrome/browser/sync/glue/device_info.h"

#include "chrome/browser/sync/glue/invalidation_adapter.h"

+#include "chrome/browser/sync/glue/local_device_info_provider_impl.h"

#include "chrome/browser/sync/glue/sync_backend_registrar.h"

#include "chrome/common/chrome_version_info.h"

#include "components/invalidation/invalidation_util.h"

@@ -405,7 +405,7 @@ void SyncBackendHostCore::DoInitialize(

// building the user agent may block on some platforms.

chrome::VersionInfo version_info;

options->http_bridge_factory->Init(

- DeviceInfo::MakeUserAgentForSyncApi(version_info));

+ LocalDeviceInfoProviderImpl::MakeUserAgentForSyncApi(version_info));

// Blow away the partial or corrupt sync data folder before doing any more

// initialization, if necessary.