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 "components/browser_sync/profile_sync_service.h" | 5 #include "components/browser_sync/profile_sync_service.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 void Initialize( | 104 void Initialize( |
105 syncer::SyncFrontend* frontend, | 105 syncer::SyncFrontend* frontend, |
106 std::unique_ptr<base::Thread> sync_thread, | 106 std::unique_ptr<base::Thread> sync_thread, |
107 const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, | 107 const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
108 const scoped_refptr<base::SingleThreadTaskRunner>& file_thread, | 108 const scoped_refptr<base::SingleThreadTaskRunner>& file_thread, |
109 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, | 109 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, |
110 const GURL& service_url, | 110 const GURL& service_url, |
111 const std::string& sync_user_agent, | 111 const std::string& sync_user_agent, |
112 const syncer::SyncCredentials& credentials, | 112 const syncer::SyncCredentials& credentials, |
113 bool delete_sync_data_folder, | 113 bool delete_sync_data_folder, |
| 114 bool enable_local_sync_backend, |
| 115 const base::FilePath& local_sync_backend_folder, |
114 std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory, | 116 std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory, |
115 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>& | 117 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>& |
116 unrecoverable_error_handler, | 118 unrecoverable_error_handler, |
117 const base::Closure& report_unrecoverable_error_function, | 119 const base::Closure& report_unrecoverable_error_function, |
118 const HttpPostProviderFactoryGetter& http_post_provider_factory_getter, | 120 const HttpPostProviderFactoryGetter& http_post_provider_factory_getter, |
119 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> | 121 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> |
120 saved_nigori_state) override {} | 122 saved_nigori_state) override {} |
121 }; | 123 }; |
122 | 124 |
123 class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock { | 125 class SyncBackendHostMockCollectDeleteDirParam : public SyncBackendHostMock { |
124 public: | 126 public: |
125 explicit SyncBackendHostMockCollectDeleteDirParam( | 127 explicit SyncBackendHostMockCollectDeleteDirParam( |
126 std::vector<bool>* delete_dir_param) | 128 std::vector<bool>* delete_dir_param) |
127 : delete_dir_param_(delete_dir_param) {} | 129 : delete_dir_param_(delete_dir_param) {} |
128 | 130 |
129 void Initialize( | 131 void Initialize( |
130 syncer::SyncFrontend* frontend, | 132 syncer::SyncFrontend* frontend, |
131 std::unique_ptr<base::Thread> sync_thread, | 133 std::unique_ptr<base::Thread> sync_thread, |
132 const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, | 134 const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
133 const scoped_refptr<base::SingleThreadTaskRunner>& file_thread, | 135 const scoped_refptr<base::SingleThreadTaskRunner>& file_thread, |
134 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, | 136 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, |
135 const GURL& service_url, | 137 const GURL& service_url, |
136 const std::string& sync_user_agent, | 138 const std::string& sync_user_agent, |
137 const syncer::SyncCredentials& credentials, | 139 const syncer::SyncCredentials& credentials, |
138 bool delete_sync_data_folder, | 140 bool delete_sync_data_folder, |
| 141 bool enable_local_sync_backend, |
| 142 const base::FilePath& local_sync_backend_folder, |
139 std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory, | 143 std::unique_ptr<syncer::SyncManagerFactory> sync_manager_factory, |
140 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>& | 144 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>& |
141 unrecoverable_error_handler, | 145 unrecoverable_error_handler, |
142 const base::Closure& report_unrecoverable_error_function, | 146 const base::Closure& report_unrecoverable_error_function, |
143 const HttpPostProviderFactoryGetter& http_post_provider_factory_getter, | 147 const HttpPostProviderFactoryGetter& http_post_provider_factory_getter, |
144 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> | 148 std::unique_ptr<syncer::SyncEncryptionHandler::NigoriState> |
145 saved_nigori_state) override { | 149 saved_nigori_state) override { |
146 delete_dir_param_->push_back(delete_sync_data_folder); | 150 delete_dir_param_->push_back(delete_sync_data_folder); |
147 SyncBackendHostMock::Initialize( | 151 SyncBackendHostMock::Initialize( |
148 frontend, std::move(sync_thread), db_thread, file_thread, event_handler, | 152 frontend, std::move(sync_thread), db_thread, file_thread, event_handler, |
149 service_url, sync_user_agent, credentials, delete_sync_data_folder, | 153 service_url, sync_user_agent, credentials, delete_sync_data_folder, |
| 154 enable_local_sync_backend, local_sync_backend_folder, |
150 std::move(sync_manager_factory), unrecoverable_error_handler, | 155 std::move(sync_manager_factory), unrecoverable_error_handler, |
151 report_unrecoverable_error_function, http_post_provider_factory_getter, | 156 report_unrecoverable_error_function, http_post_provider_factory_getter, |
152 std::move(saved_nigori_state)); | 157 std::move(saved_nigori_state)); |
153 } | 158 } |
154 | 159 |
155 private: | 160 private: |
156 std::vector<bool>* delete_dir_param_; | 161 std::vector<bool>* delete_dir_param_; |
157 }; | 162 }; |
158 | 163 |
159 // SyncBackendHostMock that calls an external callback when ClearServerData is | 164 // SyncBackendHostMock that calls an external callback when ClearServerData is |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
947 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if | 952 // dereferenced in OnSyncCycleCompleted. The fix is to use find() to check if |
948 // entry for sessions exists in map. | 953 // entry for sessions exists in map. |
949 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) { | 954 TEST_F(ProfileSyncServiceTest, ValidPointersInDTCMap) { |
950 CreateService(ProfileSyncService::AUTO_START); | 955 CreateService(ProfileSyncService::AUTO_START); |
951 service()->OnSessionRestoreComplete(); | 956 service()->OnSessionRestoreComplete(); |
952 service()->OnSyncCycleCompleted(); | 957 service()->OnSyncCycleCompleted(); |
953 } | 958 } |
954 | 959 |
955 } // namespace | 960 } // namespace |
956 } // namespace browser_sync | 961 } // namespace browser_sync |
OLD | NEW |