OLD | NEW |
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_core.h" | 5 #include "components/sync_driver/glue/sync_backend_host_core.h" |
6 | 6 |
| 7 #include <utility> |
| 8 |
7 #include "base/bind.h" | 9 #include "base/bind.h" |
8 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
9 #include "base/location.h" | 11 #include "base/location.h" |
10 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
11 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
12 #include "components/data_use_measurement/core/data_use_user_data.h" | 14 #include "components/data_use_measurement/core/data_use_user_data.h" |
13 #include "components/invalidation/public/invalidation_util.h" | 15 #include "components/invalidation/public/invalidation_util.h" |
14 #include "components/invalidation/public/object_id_invalidation_map.h" | 16 #include "components/invalidation/public/object_id_invalidation_map.h" |
15 #include "components/sync_driver/glue/sync_backend_registrar.h" | 17 #include "components/sync_driver/glue/sync_backend_registrar.h" |
16 #include "components/sync_driver/invalidation_adapter.h" | 18 #include "components/sync_driver/invalidation_adapter.h" |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
88 syncer::PassphraseTransitionClearDataOption clear_data_option, | 90 syncer::PassphraseTransitionClearDataOption clear_data_option, |
89 const std::map<syncer::ModelType, int64_t>& invalidation_versions) | 91 const std::map<syncer::ModelType, int64_t>& invalidation_versions) |
90 : sync_loop(sync_loop), | 92 : sync_loop(sync_loop), |
91 registrar(registrar), | 93 registrar(registrar), |
92 routing_info(routing_info), | 94 routing_info(routing_info), |
93 workers(workers), | 95 workers(workers), |
94 extensions_activity(extensions_activity), | 96 extensions_activity(extensions_activity), |
95 event_handler(event_handler), | 97 event_handler(event_handler), |
96 service_url(service_url), | 98 service_url(service_url), |
97 sync_user_agent(sync_user_agent), | 99 sync_user_agent(sync_user_agent), |
98 http_bridge_factory(http_bridge_factory.Pass()), | 100 http_bridge_factory(std::move(http_bridge_factory)), |
99 credentials(credentials), | 101 credentials(credentials), |
100 invalidator_client_id(invalidator_client_id), | 102 invalidator_client_id(invalidator_client_id), |
101 sync_manager_factory(sync_manager_factory.Pass()), | 103 sync_manager_factory(std::move(sync_manager_factory)), |
102 delete_sync_data_folder(delete_sync_data_folder), | 104 delete_sync_data_folder(delete_sync_data_folder), |
103 restored_key_for_bootstrapping(restored_key_for_bootstrapping), | 105 restored_key_for_bootstrapping(restored_key_for_bootstrapping), |
104 restored_keystore_key_for_bootstrapping( | 106 restored_keystore_key_for_bootstrapping( |
105 restored_keystore_key_for_bootstrapping), | 107 restored_keystore_key_for_bootstrapping), |
106 internal_components_factory(internal_components_factory.Pass()), | 108 internal_components_factory(std::move(internal_components_factory)), |
107 unrecoverable_error_handler(unrecoverable_error_handler), | 109 unrecoverable_error_handler(unrecoverable_error_handler), |
108 report_unrecoverable_error_function(report_unrecoverable_error_function), | 110 report_unrecoverable_error_function(report_unrecoverable_error_function), |
109 saved_nigori_state(saved_nigori_state.Pass()), | 111 saved_nigori_state(std::move(saved_nigori_state)), |
110 clear_data_option(clear_data_option), | 112 clear_data_option(clear_data_option), |
111 invalidation_versions(invalidation_versions) {} | 113 invalidation_versions(invalidation_versions) {} |
112 | 114 |
113 DoInitializeOptions::~DoInitializeOptions() {} | 115 DoInitializeOptions::~DoInitializeOptions() {} |
114 | 116 |
115 DoConfigureSyncerTypes::DoConfigureSyncerTypes() {} | 117 DoConfigureSyncerTypes::DoConfigureSyncerTypes() {} |
116 | 118 |
117 DoConfigureSyncerTypes::~DoConfigureSyncerTypes() {} | 119 DoConfigureSyncerTypes::~DoConfigureSyncerTypes() {} |
118 | 120 |
119 SyncBackendHostCore::SyncBackendHostCore( | 121 SyncBackendHostCore::SyncBackendHostCore( |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 last_invalidation != last_invalidation_versions_.end() && | 410 last_invalidation != last_invalidation_versions_.end() && |
409 invalidation.version() <= last_invalidation->second) { | 411 invalidation.version() <= last_invalidation->second) { |
410 DVLOG(1) << "Ignoring redundant invalidation for " | 412 DVLOG(1) << "Ignoring redundant invalidation for " |
411 << syncer::ModelTypeToString(type) << " with version " | 413 << syncer::ModelTypeToString(type) << " with version " |
412 << invalidation.version() << ", last seen version was " | 414 << invalidation.version() << ", last seen version was " |
413 << last_invalidation->second; | 415 << last_invalidation->second; |
414 continue; | 416 continue; |
415 } | 417 } |
416 scoped_ptr<syncer::InvalidationInterface> inv_adapter( | 418 scoped_ptr<syncer::InvalidationInterface> inv_adapter( |
417 new InvalidationAdapter(invalidation)); | 419 new InvalidationAdapter(invalidation)); |
418 sync_manager_->OnIncomingInvalidation(type, inv_adapter.Pass()); | 420 sync_manager_->OnIncomingInvalidation(type, std::move(inv_adapter)); |
419 if (!invalidation.is_unknown_version()) | 421 if (!invalidation.is_unknown_version()) |
420 last_invalidation_versions_[type] = invalidation.version(); | 422 last_invalidation_versions_[type] = invalidation.version(); |
421 } | 423 } |
422 } | 424 } |
423 } | 425 } |
424 | 426 |
425 host_.Call( | 427 host_.Call( |
426 FROM_HERE, | 428 FROM_HERE, |
427 &SyncBackendHostImpl::UpdateInvalidationVersions, | 429 &SyncBackendHostImpl::UpdateInvalidationVersions, |
428 last_invalidation_versions_); | 430 last_invalidation_versions_); |
(...skipping 29 matching lines...) Expand all Loading... |
458 registrar_ = options->registrar; | 460 registrar_ = options->registrar; |
459 DCHECK(registrar_); | 461 DCHECK(registrar_); |
460 | 462 |
461 sync_manager_ = options->sync_manager_factory->CreateSyncManager(name_); | 463 sync_manager_ = options->sync_manager_factory->CreateSyncManager(name_); |
462 sync_manager_->AddObserver(this); | 464 sync_manager_->AddObserver(this); |
463 | 465 |
464 syncer::SyncManager::InitArgs args; | 466 syncer::SyncManager::InitArgs args; |
465 args.database_location = sync_data_folder_path_; | 467 args.database_location = sync_data_folder_path_; |
466 args.event_handler = options->event_handler; | 468 args.event_handler = options->event_handler; |
467 args.service_url = options->service_url; | 469 args.service_url = options->service_url; |
468 args.post_factory = options->http_bridge_factory.Pass(); | 470 args.post_factory = std::move(options->http_bridge_factory); |
469 args.workers = options->workers; | 471 args.workers = options->workers; |
470 args.extensions_activity = options->extensions_activity.get(); | 472 args.extensions_activity = options->extensions_activity.get(); |
471 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate | 473 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate |
472 args.credentials = options->credentials; | 474 args.credentials = options->credentials; |
473 args.invalidator_client_id = options->invalidator_client_id; | 475 args.invalidator_client_id = options->invalidator_client_id; |
474 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping; | 476 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping; |
475 args.restored_keystore_key_for_bootstrapping = | 477 args.restored_keystore_key_for_bootstrapping = |
476 options->restored_keystore_key_for_bootstrapping; | 478 options->restored_keystore_key_for_bootstrapping; |
477 args.internal_components_factory = | 479 args.internal_components_factory = |
478 options->internal_components_factory.Pass(); | 480 std::move(options->internal_components_factory); |
479 args.encryptor = &encryptor_; | 481 args.encryptor = &encryptor_; |
480 args.unrecoverable_error_handler = options->unrecoverable_error_handler; | 482 args.unrecoverable_error_handler = options->unrecoverable_error_handler; |
481 args.report_unrecoverable_error_function = | 483 args.report_unrecoverable_error_function = |
482 options->report_unrecoverable_error_function; | 484 options->report_unrecoverable_error_function; |
483 args.cancelation_signal = &stop_syncing_signal_; | 485 args.cancelation_signal = &stop_syncing_signal_; |
484 args.saved_nigori_state = options->saved_nigori_state.Pass(); | 486 args.saved_nigori_state = std::move(options->saved_nigori_state); |
485 args.clear_data_option = options->clear_data_option; | 487 args.clear_data_option = options->clear_data_option; |
486 sync_manager_->Init(&args); | 488 sync_manager_->Init(&args); |
487 } | 489 } |
488 | 490 |
489 void SyncBackendHostCore::DoUpdateCredentials( | 491 void SyncBackendHostCore::DoUpdateCredentials( |
490 const syncer::SyncCredentials& credentials) { | 492 const syncer::SyncCredentials& credentials) { |
491 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); | 493 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); |
492 // UpdateCredentials can be called during backend initialization, possibly | 494 // UpdateCredentials can be called during backend initialization, possibly |
493 // when backend initialization has failed but hasn't notified the UI thread | 495 // when backend initialization has failed but hasn't notified the UI thread |
494 // yet. In that case, the sync manager may have been destroyed on the sync | 496 // yet. In that case, the sync manager may have been destroyed on the sync |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 | 784 |
783 void SyncBackendHostCore::ClearServerDataDone( | 785 void SyncBackendHostCore::ClearServerDataDone( |
784 const base::Closure& frontend_callback) { | 786 const base::Closure& frontend_callback) { |
785 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); | 787 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); |
786 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop, | 788 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop, |
787 frontend_callback); | 789 frontend_callback); |
788 } | 790 } |
789 | 791 |
790 | 792 |
791 } // namespace browser_sync | 793 } // namespace browser_sync |
OLD | NEW |