chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 1397913002: [Sync] Componentize local_device_info_provider_impl and test

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/profile_sync_components_factory_impl.cc

Issue 1397913002: [Sync] Componentize local_device_info_provider_impl and test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Download patch

« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_core.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | components/sync_driver/local_device_info_provider_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_components_factory_impl.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc

index efba56d6d4f927b8fc77426496811ead4b637d36..032a945b4c298e87cc162c9ae17e307294bf90a7 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc

@@ -12,7 +12,6 @@

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

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

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

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

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

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

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

@@ -36,6 +35,7 @@

#include "components/sync_driver/device_info_data_type_controller.h"

#include "components/sync_driver/glue/chrome_report_unrecoverable_error.h"

#include "components/sync_driver/glue/typed_url_model_associator.h"

+#include "components/sync_driver/local_device_info_provider_impl.h"

#include "components/sync_driver/proxy_data_type_controller.h"

#include "components/sync_driver/sync_client.h"

#include "components/sync_driver/ui_data_type_controller.h"

@@ -421,7 +421,8 @@ ProfileSyncComponentsFactoryImpl::CreateSyncBackendHost(

scoped_ptr<sync_driver::LocalDeviceInfoProvider>

ProfileSyncComponentsFactoryImpl::CreateLocalDeviceInfoProvider() {

return scoped_ptr<sync_driver::LocalDeviceInfoProvider>(

- new browser_sync::LocalDeviceInfoProviderImpl());

+ new browser_sync::LocalDeviceInfoProviderImpl(

+ chrome::GetChannel(), chrome::GetVersionString()));

Avi (use Gerrit) 2015/10/10 03:52:51 Why don't you also pass in the is_tablet boolean h

Nicolas Zea 2015/10/12 17:44:02 Mainly from assuming we're going to eventually use

}

class TokenServiceProvider