sync/internal_api/sync_manager_impl.cc - Issue 10837231: sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components.

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: sync/internal_api/sync_manager_impl.cc

Issue 10837231: sync: add InternalComponentsFactory::Switches to simplify passing switches to internal components. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: pass switches in test_profile_sync_service.cc Created 8 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 side-by-side diff with in-line comments

Download patch

« sync/internal_api/public/internal_components_factory.h ('K') | « sync/internal_api/sync_manager_impl.h ('k') | sync/internal_api/sync_manager_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: sync/internal_api/sync_manager_impl.cc

diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc

index 28d6b3c2f4714fb753505b0fc1439e6b85b49640..95d650caaeccb56eb8a64ecd81e7e3b8a7758123 100644

--- a/sync/internal_api/sync_manager_impl.cc

+++ b/sync/internal_api/sync_manager_impl.cc

@@ -377,7 +377,6 @@ void SyncManagerImpl::Init(

scoped_ptr<SyncNotifier> sync_notifier,

const std::string& restored_key_for_bootstrapping,

const std::string& restored_keystore_key_for_bootstrapping,

- bool keystore_encryption_enabled,

scoped_ptr<InternalComponentsFactory> internal_components_factory,

Encryptor* encryptor,

UnrecoverableErrorHandler* unrecoverable_error_handler,

@@ -468,8 +467,7 @@ void SyncManagerImpl::Init(

&throttled_data_type_tracker_,

listeners,

&debug_info_event_listener_,

- &traffic_recorder_,

- keystore_encryption_enabled).Pass();

+ &traffic_recorder_).Pass();

session_context_->set_account_name(credentials.email);

scheduler_ = internal_components_factory->BuildScheduler(

name_, session_context_.get()).Pass();