Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: components/sync/driver/glue/sync_backend_host_impl_unittest.cc

Issue 2481313002: [Sync] Move sync thread ownership to ProfileSyncService. (Closed)
Patch Set: Address comments. Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/sync/driver/glue/sync_backend_host_impl.h" 5 #include "components/sync/driver/glue/sync_backend_host_impl.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 case GROUP_PASSIVE: 147 case GROUP_PASSIVE:
148 return new PassiveModelWorker(); 148 return new PassiveModelWorker();
149 default: 149 default:
150 return nullptr; 150 return nullptr;
151 } 151 }
152 } 152 }
153 }; 153 };
154 154
155 class SyncBackendHostTest : public testing::Test { 155 class SyncBackendHostTest : public testing::Test {
156 protected: 156 protected:
157 SyncBackendHostTest() : fake_manager_(nullptr) {} 157 SyncBackendHostTest()
158 : sync_thread_("SyncThreadForTest"), fake_manager_(nullptr) {}
158 159
159 ~SyncBackendHostTest() override {} 160 ~SyncBackendHostTest() override {}
160 161
161 void SetUp() override { 162 void SetUp() override {
162 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 163 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
163 164
164 SyncPrefs::RegisterProfilePrefs(pref_service_.registry()); 165 SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
165 166
166 sync_prefs_ = base::MakeUnique<SyncPrefs>(&pref_service_); 167 sync_prefs_ = base::MakeUnique<SyncPrefs>(&pref_service_);
168 sync_thread_.StartAndWaitForTesting();
167 backend_ = base::MakeUnique<SyncBackendHostImpl>( 169 backend_ = base::MakeUnique<SyncBackendHostImpl>(
168 "dummyDebugName", &sync_client_, base::ThreadTaskRunnerHandle::Get(), 170 "dummyDebugName", &sync_client_, base::ThreadTaskRunnerHandle::Get(),
169 nullptr, sync_prefs_->AsWeakPtr(), 171 nullptr, sync_prefs_->AsWeakPtr(),
170 temp_dir_.GetPath().Append(base::FilePath(kTestSyncDir))); 172 temp_dir_.GetPath().Append(base::FilePath(kTestSyncDir)));
171 credentials_.account_id = "user@example.com"; 173 credentials_.account_id = "user@example.com";
172 credentials_.email = "user@example.com"; 174 credentials_.email = "user@example.com";
173 credentials_.sync_token = "sync_token"; 175 credentials_.sync_token = "sync_token";
174 credentials_.scope_set.insert(GaiaConstants::kChromeSyncOAuth2Scope); 176 credentials_.scope_set.insert(GaiaConstants::kChromeSyncOAuth2Scope);
175 177
176 fake_manager_factory_ = 178 fake_manager_factory_ =
(...skipping 27 matching lines...) Expand all
204 // Synchronously initializes the backend. 206 // Synchronously initializes the backend.
205 void InitializeBackend(bool expect_success) { 207 void InitializeBackend(bool expect_success) {
206 EXPECT_CALL(mock_frontend_, OnBackendInitialized(_, _, _, expect_success)) 208 EXPECT_CALL(mock_frontend_, OnBackendInitialized(_, _, _, expect_success))
207 .WillOnce(InvokeWithoutArgs(QuitMessageLoop)); 209 .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
208 SyncBackendHost::HttpPostProviderFactoryGetter 210 SyncBackendHost::HttpPostProviderFactoryGetter
209 http_post_provider_factory_getter = 211 http_post_provider_factory_getter =
210 base::Bind(&NetworkResources::GetHttpPostProviderFactory, 212 base::Bind(&NetworkResources::GetHttpPostProviderFactory,
211 base::Unretained(network_resources_.get()), nullptr, 213 base::Unretained(network_resources_.get()), nullptr,
212 base::Bind(&EmptyNetworkTimeUpdate)); 214 base::Bind(&EmptyNetworkTimeUpdate));
213 backend_->Initialize( 215 backend_->Initialize(
214 &mock_frontend_, std::unique_ptr<base::Thread>(), 216 &mock_frontend_, &sync_thread_, base::ThreadTaskRunnerHandle::Get(),
215 base::ThreadTaskRunnerHandle::Get(),
216 base::ThreadTaskRunnerHandle::Get(), WeakHandle<JsEventHandler>(), 217 base::ThreadTaskRunnerHandle::Get(), WeakHandle<JsEventHandler>(),
217 GURL(std::string()), std::string(), credentials_, true, false, 218 GURL(std::string()), std::string(), credentials_, true, false,
218 base::FilePath(), std::move(fake_manager_factory_), 219 base::FilePath(), std::move(fake_manager_factory_),
219 MakeWeakHandle(test_unrecoverable_error_handler_.GetWeakPtr()), 220 MakeWeakHandle(test_unrecoverable_error_handler_.GetWeakPtr()),
220 base::Closure(), http_post_provider_factory_getter, 221 base::Closure(), http_post_provider_factory_getter,
221 std::move(saved_nigori_state_)); 222 std::move(saved_nigori_state_));
222 base::RunLoop run_loop; 223 base::RunLoop run_loop;
223 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( 224 base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
224 FROM_HERE, run_loop.QuitClosure(), TestTimeouts::action_timeout()); 225 FROM_HERE, run_loop.QuitClosure(), TestTimeouts::action_timeout());
225 run_loop.Run(); 226 run_loop.Run();
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 protected: 261 protected:
261 void DownloadReady(ModelTypeSet succeeded_types, ModelTypeSet failed_types) { 262 void DownloadReady(ModelTypeSet succeeded_types, ModelTypeSet failed_types) {
262 base::MessageLoop::current()->QuitWhenIdle(); 263 base::MessageLoop::current()->QuitWhenIdle();
263 } 264 }
264 265
265 void OnDownloadRetry() { NOTIMPLEMENTED(); } 266 void OnDownloadRetry() { NOTIMPLEMENTED(); }
266 267
267 base::MessageLoop message_loop_; 268 base::MessageLoop message_loop_;
268 base::ScopedTempDir temp_dir_; 269 base::ScopedTempDir temp_dir_;
269 sync_preferences::TestingPrefServiceSyncable pref_service_; 270 sync_preferences::TestingPrefServiceSyncable pref_service_;
271 base::Thread sync_thread_;
270 StrictMock<MockSyncFrontend> mock_frontend_; 272 StrictMock<MockSyncFrontend> mock_frontend_;
271 SyncCredentials credentials_; 273 SyncCredentials credentials_;
272 BackendSyncClient sync_client_; 274 BackendSyncClient sync_client_;
273 TestUnrecoverableErrorHandler test_unrecoverable_error_handler_; 275 TestUnrecoverableErrorHandler test_unrecoverable_error_handler_;
274 std::unique_ptr<SyncPrefs> sync_prefs_; 276 std::unique_ptr<SyncPrefs> sync_prefs_;
275 std::unique_ptr<SyncBackendHostImpl> backend_; 277 std::unique_ptr<SyncBackendHostImpl> backend_;
276 std::unique_ptr<FakeSyncManagerFactory> fake_manager_factory_; 278 std::unique_ptr<FakeSyncManagerFactory> fake_manager_factory_;
277 FakeSyncManager* fake_manager_; 279 FakeSyncManager* fake_manager_;
278 ModelTypeSet enabled_types_; 280 ModelTypeSet enabled_types_;
279 std::unique_ptr<NetworkResources> network_resources_; 281 std::unique_ptr<NetworkResources> network_resources_;
(...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 backend_->StopSyncingForShutdown(); 831 backend_->StopSyncingForShutdown();
830 // Verify that call to DeactivateNonBlockingDataType doesn't assert. 832 // Verify that call to DeactivateNonBlockingDataType doesn't assert.
831 backend_->DeactivateNonBlockingDataType(AUTOFILL); 833 backend_->DeactivateNonBlockingDataType(AUTOFILL);
832 backend_->Shutdown(STOP_SYNC); 834 backend_->Shutdown(STOP_SYNC);
833 backend_.reset(); 835 backend_.reset();
834 } 836 }
835 837
836 } // namespace 838 } // namespace
837 839
838 } // namespace syncer 840 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/driver/glue/sync_backend_host_impl.cc ('k') | components/sync/driver/glue/sync_backend_host_mock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698