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

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

Issue 2470153002: Revert of [Sync] Adds a new switch for enabling the new local server backend. (Closed)
Patch Set: 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_core.h" 5 #include "components/sync/driver/glue/sync_backend_host_core.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 const std::vector<scoped_refptr<ModelSafeWorker>>& workers, 59 const std::vector<scoped_refptr<ModelSafeWorker>>& workers,
60 const scoped_refptr<ExtensionsActivity>& extensions_activity, 60 const scoped_refptr<ExtensionsActivity>& extensions_activity,
61 const WeakHandle<JsEventHandler>& event_handler, 61 const WeakHandle<JsEventHandler>& event_handler,
62 const GURL& service_url, 62 const GURL& service_url,
63 const std::string& sync_user_agent, 63 const std::string& sync_user_agent,
64 std::unique_ptr<HttpPostProviderFactory> http_bridge_factory, 64 std::unique_ptr<HttpPostProviderFactory> http_bridge_factory,
65 const SyncCredentials& credentials, 65 const SyncCredentials& credentials,
66 const std::string& invalidator_client_id, 66 const std::string& invalidator_client_id,
67 std::unique_ptr<SyncManagerFactory> sync_manager_factory, 67 std::unique_ptr<SyncManagerFactory> sync_manager_factory,
68 bool delete_sync_data_folder, 68 bool delete_sync_data_folder,
69 bool enable_local_sync_backend,
70 const base::FilePath& local_sync_backend_folder,
71 const std::string& restored_key_for_bootstrapping, 69 const std::string& restored_key_for_bootstrapping,
72 const std::string& restored_keystore_key_for_bootstrapping, 70 const std::string& restored_keystore_key_for_bootstrapping,
73 std::unique_ptr<EngineComponentsFactory> engine_components_factory, 71 std::unique_ptr<EngineComponentsFactory> engine_components_factory,
74 const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler, 72 const WeakHandle<UnrecoverableErrorHandler>& unrecoverable_error_handler,
75 const base::Closure& report_unrecoverable_error_function, 73 const base::Closure& report_unrecoverable_error_function,
76 std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state, 74 std::unique_ptr<SyncEncryptionHandler::NigoriState> saved_nigori_state,
77 const std::map<ModelType, int64_t>& invalidation_versions) 75 const std::map<ModelType, int64_t>& invalidation_versions)
78 : sync_loop(sync_loop), 76 : sync_loop(sync_loop),
79 registrar(registrar), 77 registrar(registrar),
80 workers(workers), 78 workers(workers),
81 extensions_activity(extensions_activity), 79 extensions_activity(extensions_activity),
82 event_handler(event_handler), 80 event_handler(event_handler),
83 service_url(service_url), 81 service_url(service_url),
84 sync_user_agent(sync_user_agent), 82 sync_user_agent(sync_user_agent),
85 http_bridge_factory(std::move(http_bridge_factory)), 83 http_bridge_factory(std::move(http_bridge_factory)),
86 credentials(credentials), 84 credentials(credentials),
87 invalidator_client_id(invalidator_client_id), 85 invalidator_client_id(invalidator_client_id),
88 sync_manager_factory(std::move(sync_manager_factory)), 86 sync_manager_factory(std::move(sync_manager_factory)),
89 delete_sync_data_folder(delete_sync_data_folder), 87 delete_sync_data_folder(delete_sync_data_folder),
90 enable_local_sync_backend(enable_local_sync_backend),
91 local_sync_backend_folder(local_sync_backend_folder),
92 restored_key_for_bootstrapping(restored_key_for_bootstrapping), 88 restored_key_for_bootstrapping(restored_key_for_bootstrapping),
93 restored_keystore_key_for_bootstrapping( 89 restored_keystore_key_for_bootstrapping(
94 restored_keystore_key_for_bootstrapping), 90 restored_keystore_key_for_bootstrapping),
95 engine_components_factory(std::move(engine_components_factory)), 91 engine_components_factory(std::move(engine_components_factory)),
96 unrecoverable_error_handler(unrecoverable_error_handler), 92 unrecoverable_error_handler(unrecoverable_error_handler),
97 report_unrecoverable_error_function(report_unrecoverable_error_function), 93 report_unrecoverable_error_function(report_unrecoverable_error_function),
98 saved_nigori_state(std::move(saved_nigori_state)), 94 saved_nigori_state(std::move(saved_nigori_state)),
99 invalidation_versions(invalidation_versions) {} 95 invalidation_versions(invalidation_versions) {}
100 96
101 DoInitializeOptions::~DoInitializeOptions() {} 97 DoInitializeOptions::~DoInitializeOptions() {}
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 registrar_ = options->registrar; 400 registrar_ = options->registrar;
405 DCHECK(registrar_); 401 DCHECK(registrar_);
406 402
407 sync_manager_ = options->sync_manager_factory->CreateSyncManager(name_); 403 sync_manager_ = options->sync_manager_factory->CreateSyncManager(name_);
408 sync_manager_->AddObserver(this); 404 sync_manager_->AddObserver(this);
409 405
410 SyncManager::InitArgs args; 406 SyncManager::InitArgs args;
411 args.database_location = sync_data_folder_path_; 407 args.database_location = sync_data_folder_path_;
412 args.event_handler = options->event_handler; 408 args.event_handler = options->event_handler;
413 args.service_url = options->service_url; 409 args.service_url = options->service_url;
414 args.enable_local_sync_backend = options->enable_local_sync_backend;
415 args.local_sync_backend_folder = options->local_sync_backend_folder;
416 args.post_factory = std::move(options->http_bridge_factory); 410 args.post_factory = std::move(options->http_bridge_factory);
417 args.workers = options->workers; 411 args.workers = options->workers;
418 args.extensions_activity = options->extensions_activity.get(); 412 args.extensions_activity = options->extensions_activity.get();
419 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate 413 args.change_delegate = options->registrar; // as SyncManager::ChangeDelegate
420 args.credentials = options->credentials; 414 args.credentials = options->credentials;
421 args.invalidator_client_id = options->invalidator_client_id; 415 args.invalidator_client_id = options->invalidator_client_id;
422 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping; 416 args.restored_key_for_bootstrapping = options->restored_key_for_bootstrapping;
423 args.restored_keystore_key_for_bootstrapping = 417 args.restored_keystore_key_for_bootstrapping =
424 options->restored_keystore_key_for_bootstrapping; 418 options->restored_keystore_key_for_bootstrapping;
425 args.engine_components_factory = 419 args.engine_components_factory =
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 } 682 }
689 683
690 void SyncBackendHostCore::ClearServerDataDone( 684 void SyncBackendHostCore::ClearServerDataDone(
691 const base::Closure& frontend_callback) { 685 const base::Closure& frontend_callback) {
692 DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread()); 686 DCHECK(sync_loop_->task_runner()->BelongsToCurrentThread());
693 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop, 687 host_.Call(FROM_HERE, &SyncBackendHostImpl::ClearServerDataDoneOnFrontendLoop,
694 frontend_callback); 688 frontend_callback);
695 } 689 }
696 690
697 } // namespace syncer 691 } // namespace syncer
OLDNEW
« no previous file with comments | « components/sync/driver/glue/sync_backend_host_core.h ('k') | components/sync/driver/glue/sync_backend_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698