diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 00:06:15 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 00:06:15 +0000 |
| commit | 43ee82166efe4fea87bb186c629a35b3a8995fe2 (patch) | |
| tree | 4aaefc82b73c3e0b4af7b8fc536476afed5a6ec5 /sync/internal_api/test | |
| parent | 2238037ce16a1f6e736001813b6a05c87fe0f7a9 (diff) | |
| download | chromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.zip chromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.tar.gz chromium_src-43ee82166efe4fea87bb186c629a35b3a8995fe2.tar.bz2 | |
Add non-blocking sync code to ProfileSyncService
Adds support for non-blocking sync to the ProfileSyncService and related
classes. This continues the work of r258390 and r259921. Like those
patches, it is not expected to have any impact on behavior.
Introduces ProfileSyncService::RegisterNonBlockingType(). This function
will act as an alternative to RegisterDataTypeController().
Adds some support for these non-blocking types. Adds a special
case to the code that generates the 'type status' table on the
about:sync page.
Instantiates and copies a SyncCoreProxy object to the ProfileSyncService
as backend initialization completes. This will be an important part of
non-blocking data type initialization, once that functionality is
supported.
BUG=351005
Review URL: https://codereview.chromium.org/217183003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/internal_api/test')
| -rw-r--r-- | sync/internal_api/test/fake_sync_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc index 3fdbefa..c7dd249 100644 --- a/sync/internal_api/test/fake_sync_manager.cc +++ b/sync/internal_api/test/fake_sync_manager.cc @@ -218,8 +218,8 @@ UserShare* FakeSyncManager::GetUserShare() { return test_user_share_.user_share(); } -syncer::SyncCore* FakeSyncManager::GetSyncCore() { - return NULL; +base::WeakPtr<syncer::SyncCore> FakeSyncManager::GetSyncCore() { + return base::WeakPtr<syncer::SyncCore>(); } const std::string FakeSyncManager::cache_guid() { |