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

Side by Side Diff: chrome/browser/sync/glue/sync_backend_host_core.cc

Issue 1275743002: [Sync] Remove backend unrecoverable error handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix leak Created 5 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 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 "chrome/browser/sync/glue/sync_backend_host_core.h" 5 #include "chrome/browser/sync/glue/sync_backend_host_core.h"
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler, 62 const syncer::WeakHandle<syncer::JsEventHandler>& event_handler,
63 const GURL& service_url, 63 const GURL& service_url,
64 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory, 64 scoped_ptr<syncer::HttpPostProviderFactory> http_bridge_factory,
65 const syncer::SyncCredentials& credentials, 65 const syncer::SyncCredentials& credentials,
66 const std::string& invalidator_client_id, 66 const std::string& invalidator_client_id,
67 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory, 67 scoped_ptr<syncer::SyncManagerFactory> sync_manager_factory,
68 bool delete_sync_data_folder, 68 bool delete_sync_data_folder,
69 const std::string& restored_key_for_bootstrapping, 69 const std::string& restored_key_for_bootstrapping,
70 const std::string& restored_keystore_key_for_bootstrapping, 70 const std::string& restored_keystore_key_for_bootstrapping,
71 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory, 71 scoped_ptr<syncer::InternalComponentsFactory> internal_components_factory,
72 scoped_ptr<syncer::UnrecoverableErrorHandler> unrecoverable_error_handler, 72 const syncer::WeakHandle<syncer::UnrecoverableErrorHandler>&
73 unrecoverable_error_handler,
73 const base::Closure& report_unrecoverable_error_function, 74 const base::Closure& report_unrecoverable_error_function,
74 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state, 75 scoped_ptr<syncer::SyncEncryptionHandler::NigoriState> saved_nigori_state,
75 syncer::PassphraseTransitionClearDataOption clear_data_option, 76 syncer::PassphraseTransitionClearDataOption clear_data_option,
76 const std::map<syncer::ModelType, int64>& invalidation_versions) 77 const std::map<syncer::ModelType, int64>& invalidation_versions)
77 : sync_loop(sync_loop), 78 : sync_loop(sync_loop),
78 registrar(registrar), 79 registrar(registrar),
79 routing_info(routing_info), 80 routing_info(routing_info),
80 workers(workers), 81 workers(workers),
81 extensions_activity(extensions_activity), 82 extensions_activity(extensions_activity),
82 event_handler(event_handler), 83 event_handler(event_handler),
83 service_url(service_url), 84 service_url(service_url),
84 http_bridge_factory(http_bridge_factory.Pass()), 85 http_bridge_factory(http_bridge_factory.Pass()),
85 credentials(credentials), 86 credentials(credentials),
86 invalidator_client_id(invalidator_client_id), 87 invalidator_client_id(invalidator_client_id),
87 sync_manager_factory(sync_manager_factory.Pass()), 88 sync_manager_factory(sync_manager_factory.Pass()),
88 delete_sync_data_folder(delete_sync_data_folder), 89 delete_sync_data_folder(delete_sync_data_folder),
89 restored_key_for_bootstrapping(restored_key_for_bootstrapping), 90 restored_key_for_bootstrapping(restored_key_for_bootstrapping),
90 restored_keystore_key_for_bootstrapping( 91 restored_keystore_key_for_bootstrapping(
91 restored_keystore_key_for_bootstrapping), 92 restored_keystore_key_for_bootstrapping),
92 internal_components_factory(internal_components_factory.Pass()), 93 internal_components_factory(internal_components_factory.Pass()),
93 unrecoverable_error_handler(unrecoverable_error_handler.Pass()), 94 unrecoverable_error_handler(unrecoverable_error_handler),
94 report_unrecoverable_error_function(report_unrecoverable_error_function), 95 report_unrecoverable_error_function(report_unrecoverable_error_function),
95 saved_nigori_state(saved_nigori_state.Pass()), 96 saved_nigori_state(saved_nigori_state.Pass()),
96 clear_data_option(clear_data_option), 97 clear_data_option(clear_data_option),
97 invalidation_versions(invalidation_versions) {} 98 invalidation_versions(invalidation_versions) {}
98 99
99 DoInitializeOptions::~DoInitializeOptions() {} 100 DoInitializeOptions::~DoInitializeOptions() {}
100 101
101 DoConfigureSyncerTypes::DoConfigureSyncerTypes() {} 102 DoConfigureSyncerTypes::DoConfigureSyncerTypes() {}
102 103
103 DoConfigureSyncerTypes::~DoConfigureSyncerTypes() {} 104 DoConfigureSyncerTypes::~DoConfigureSyncerTypes() {}
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 args.extensions_activity = options->extensions_activity.get(); 457 args.extensions_activity = options->extensions_activity.get();
457 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate 458 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate
458 args.credentials = options->credentials; 459 args.credentials = options->credentials;
459 args.invalidator_client_id = options->invalidator_client_id; 460 args.invalidator_client_id = options->invalidator_client_id;
460 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping; 461 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping;
461 args.restored_keystore_key_for_bootstrapping = 462 args.restored_keystore_key_for_bootstrapping =
462 options->restored_keystore_key_for_bootstrapping; 463 options->restored_keystore_key_for_bootstrapping;
463 args.internal_components_factory = 464 args.internal_components_factory =
464 options->internal_components_factory.Pass(); 465 options->internal_components_factory.Pass();
465 args.encryptor = &encryptor_; 466 args.encryptor = &encryptor_;
466 args.unrecoverable_error_handler = 467 args.unrecoverable_error_handler = options->unrecoverable_error_handler;
467 options->unrecoverable_error_handler.Pass();
468 args.report_unrecoverable_error_function = 468 args.report_unrecoverable_error_function =
469 options->report_unrecoverable_error_function; 469 options->report_unrecoverable_error_function;
470 args.cancelation_signal = &stop_syncing_signal_; 470 args.cancelation_signal = &stop_syncing_signal_;
471 args.saved_nigori_state = options->saved_nigori_state.Pass(); 471 args.saved_nigori_state = options->saved_nigori_state.Pass();
472 args.clear_data_option = options->clear_data_option; 472 args.clear_data_option = options->clear_data_option;
473 sync_manager_->Init(&args); 473 sync_manager_->Init(&args);
474 } 474 }
475 475
476 void SyncBackendHostCore::DoUpdateCredentials( 476 void SyncBackendHostCore::DoUpdateCredentials(
477 const syncer::SyncCredentials& credentials) { 477 const syncer::SyncCredentials& credentials) {
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 769
770 void SyncBackendHostCore::ClearServerDataDone( 770 void SyncBackendHostCore::ClearServerDataDone(
771 const base::Closure& frontend_callback) { 771 const base::Closure& frontend_callback) {
772 DCHECK_EQ(base::MessageLoop::current(), sync_loop_); 772 DCHECK_EQ(base::MessageLoop::current(), sync_loop_);
773 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop, 773 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop,
774 frontend_callback); 774 frontend_callback);
775 } 775 }
776 776
777 777
778 } // namespace browser_sync 778 } // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/glue/sync_backend_host_core.h ('k') | chrome/browser/sync/glue/sync_backend_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698