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

Side by Side Diff: chrome/browser/sync/chrome_sync_client.cc

Issue 2944993002: Remove dependency on BrowserThread::FILE from Sync code (Closed)
Patch Set: More explicit about returning nullptr ModelSafeWorker for FILE group on Android and iOS Created 3 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/chrome_sync_client.h" 5 #include "chrome/browser/sync/chrome_sync_client.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/syslog_logging.h" 13 #include "base/syslog_logging.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "chrome/browser/autofill/personal_data_manager_factory.h" 15 #include "chrome/browser/autofill/personal_data_manager_factory.h"
16 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 16 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
17 #include "chrome/browser/browser_process.h" 17 #include "chrome/browser/browser_process.h"
18 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h" 18 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
19 #include "chrome/browser/extensions/api/storage/backend_task_runner.h"
19 #include "chrome/browser/favicon/favicon_service_factory.h" 20 #include "chrome/browser/favicon/favicon_service_factory.h"
20 #include "chrome/browser/history/history_service_factory.h" 21 #include "chrome/browser/history/history_service_factory.h"
21 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" 22 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h"
22 #include "chrome/browser/password_manager/password_store_factory.h" 23 #include "chrome/browser/password_manager/password_store_factory.h"
23 #include "chrome/browser/prefs/pref_service_syncable_util.h" 24 #include "chrome/browser/prefs/pref_service_syncable_util.h"
24 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
25 #include "chrome/browser/profiles/profile_manager.h" 26 #include "chrome/browser/profiles/profile_manager.h"
26 #include "chrome/browser/search_engines/template_url_service_factory.h" 27 #include "chrome/browser/search_engines/template_url_service_factory.h"
27 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 28 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
28 #include "chrome/browser/sync/glue/sync_start_util.h" 29 #include "chrome/browser/sync/glue/sync_start_util.h"
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 } 530 }
530 531
531 scoped_refptr<syncer::ModelSafeWorker> 532 scoped_refptr<syncer::ModelSafeWorker>
532 ChromeSyncClient::CreateModelWorkerForGroup(syncer::ModelSafeGroup group) { 533 ChromeSyncClient::CreateModelWorkerForGroup(syncer::ModelSafeGroup group) {
533 DCHECK_CURRENTLY_ON(BrowserThread::UI); 534 DCHECK_CURRENTLY_ON(BrowserThread::UI);
534 switch (group) { 535 switch (group) {
535 case syncer::GROUP_DB: 536 case syncer::GROUP_DB:
536 return new syncer::SequencedModelWorker( 537 return new syncer::SequencedModelWorker(
537 BrowserThread::GetTaskRunnerForThread(BrowserThread::DB), 538 BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
538 syncer::GROUP_DB); 539 syncer::GROUP_DB);
540 // TODO(stanisc): crbug.com/731903: Rename GROUP_FILE to reflect that it is
541 // used only for app and extension settings.
539 case syncer::GROUP_FILE: 542 case syncer::GROUP_FILE:
543 #if BUILDFLAG(ENABLE_EXTENSIONS)
540 return new syncer::SequencedModelWorker( 544 return new syncer::SequencedModelWorker(
541 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 545 extensions::GetBackendTaskRunner(), syncer::GROUP_FILE);
542 syncer::GROUP_FILE); 546 #else
547 return nullptr;
548 #endif // BUILDFLAG(ENABLE_EXTENSIONS)
543 case syncer::GROUP_UI: 549 case syncer::GROUP_UI:
544 return new syncer::UIModelWorker( 550 return new syncer::UIModelWorker(
545 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)); 551 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI));
546 case syncer::GROUP_PASSIVE: 552 case syncer::GROUP_PASSIVE:
547 return new syncer::PassiveModelWorker(); 553 return new syncer::PassiveModelWorker();
548 case syncer::GROUP_HISTORY: { 554 case syncer::GROUP_HISTORY: {
549 history::HistoryService* history_service = GetHistoryService(); 555 history::HistoryService* history_service = GetHistoryService();
550 if (!history_service) 556 if (!history_service)
551 return nullptr; 557 return nullptr;
552 return new HistoryModelWorker( 558 return new HistoryModelWorker(
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 sync_service->RegisterDataTypeController( 724 sync_service->RegisterDataTypeController(
719 base::MakeUnique<SupervisedUserSyncDataTypeController>( 725 base::MakeUnique<SupervisedUserSyncDataTypeController>(
720 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_)); 726 syncer::SUPERVISED_USER_SETTINGS, error_callback, this, profile_));
721 sync_service->RegisterDataTypeController( 727 sync_service->RegisterDataTypeController(
722 base::MakeUnique<SupervisedUserSyncDataTypeController>( 728 base::MakeUnique<SupervisedUserSyncDataTypeController>(
723 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_)); 729 syncer::SUPERVISED_USER_WHITELISTS, error_callback, this, profile_));
724 #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS) 730 #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
725 } 731 }
726 732
727 } // namespace browser_sync 733 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698