| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "sync/internal_api/public/internal_components_factory_impl.h" | 5 #include "sync/internal_api/public/internal_components_factory_impl.h" | 
| 6 | 6 | 
| 7 #include "sync/engine/backoff_delay_provider.h" | 7 #include "sync/engine/backoff_delay_provider.h" | 
| 8 #include "sync/engine/syncer.h" | 8 #include "sync/engine/syncer.h" | 
| 9 #include "sync/engine/sync_scheduler_impl.h" | 9 #include "sync/engine/sync_scheduler_impl.h" | 
| 10 #include "sync/sessions/sync_session_context.h" | 10 #include "sync/sessions/sync_session_context.h" | 
| (...skipping 30 matching lines...) Expand all  Loading... | 
| 41     const std::vector<SyncEngineEventListener*>& listeners, | 41     const std::vector<SyncEngineEventListener*>& listeners, | 
| 42     sessions::DebugInfoGetter* debug_info_getter, | 42     sessions::DebugInfoGetter* debug_info_getter, | 
| 43     TrafficRecorder* traffic_recorder, | 43     TrafficRecorder* traffic_recorder, | 
| 44     const std::string& invalidation_client_id) { | 44     const std::string& invalidation_client_id) { | 
| 45   return scoped_ptr<sessions::SyncSessionContext>( | 45   return scoped_ptr<sessions::SyncSessionContext>( | 
| 46       new sessions::SyncSessionContext( | 46       new sessions::SyncSessionContext( | 
| 47           connection_manager, directory, workers, monitor, | 47           connection_manager, directory, workers, monitor, | 
| 48           listeners, debug_info_getter, | 48           listeners, debug_info_getter, | 
| 49           traffic_recorder, | 49           traffic_recorder, | 
| 50           switches_.encryption_method == ENCRYPTION_KEYSTORE, | 50           switches_.encryption_method == ENCRYPTION_KEYSTORE, | 
|  | 51           switches_.pre_commit_updates_policy_override == | 
|  | 52               FORCE_ENABLE_PRE_COMMIT_UPDATE_AVOIDANCE, | 
| 51           invalidation_client_id)); | 53           invalidation_client_id)); | 
| 52 } | 54 } | 
| 53 | 55 | 
| 54 scoped_ptr<syncable::DirectoryBackingStore> | 56 scoped_ptr<syncable::DirectoryBackingStore> | 
| 55 InternalComponentsFactoryImpl::BuildDirectoryBackingStore( | 57 InternalComponentsFactoryImpl::BuildDirectoryBackingStore( | 
| 56       const std::string& dir_name, const base::FilePath& backing_filepath) { | 58       const std::string& dir_name, const base::FilePath& backing_filepath) { | 
| 57   return scoped_ptr<syncable::DirectoryBackingStore>( | 59   return scoped_ptr<syncable::DirectoryBackingStore>( | 
| 58       new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath)); | 60       new syncable::OnDiskDirectoryBackingStore(dir_name, backing_filepath)); | 
| 59 } | 61 } | 
| 60 | 62 | 
| 61 InternalComponentsFactory::Switches | 63 InternalComponentsFactory::Switches | 
| 62 InternalComponentsFactoryImpl::GetSwitches() const { | 64 InternalComponentsFactoryImpl::GetSwitches() const { | 
| 63   return switches_; | 65   return switches_; | 
| 64 } | 66 } | 
| 65 | 67 | 
| 66 }  // namespace syncer | 68 }  // namespace syncer | 
| OLD | NEW | 
|---|