summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/test_profile_sync_service.cc
diff options
context:
space:
mode:
authortim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 02:34:48 +0000
committertim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-30 02:34:48 +0000
commit7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4 (patch)
treee56bacac84e7ab2ce10ff5b5adcff85859fdbb38 /chrome/browser/sync/test_profile_sync_service.cc
parent2404a282786943958a5fce4cd111dfa538ae0a33 (diff)
downloadchromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.zip
chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.gz
chromium_src-7800d79ee9ecdfcca77ba895b7679c8f1fb85ee4.tar.bz2
sync: move invalidation version prefs out of SyncPrefs into InvalidatorStorage.
De-coupling so we don't add more sync < > invalidations deps while adding support for storing opaque notification state in InvalidationStateTracker. Added get/setters to InvalidationStateTracker and impl (InvalidatorStorage), but it's not wired up for use yet. Next step is to add migration code to move state from syncable::Directory to InvalidationStateTracker. Comment in invalidator_storage.h explains motivations for not moving out of sync. This patch creates the c/b/s/invalidations directory, which we can move non-profile-sync-specific chrome invalidations code to (such as BridgedSyncNotifier, and the android related part of ChromeSyncNotificationsBridge). BUG=124140 TEST=InvalidatorStorageTest, should be no functional changes Review URL: https://chromiumcodereview.appspot.com/10451058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139464 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/test_profile_sync_service.cc')
-rw-r--r--chrome/browser/sync/test_profile_sync_service.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc
index d99fdbc..60c881b 100644
--- a/chrome/browser/sync/test_profile_sync_service.cc
+++ b/chrome/browser/sync/test_profile_sync_service.cc
@@ -31,12 +31,13 @@ namespace browser_sync {
SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
Profile* profile,
const base::WeakPtr<SyncPrefs>& sync_prefs,
+ const base::WeakPtr<InvalidatorStorage>& invalidator_storage,
bool set_initial_sync_ended_on_init,
bool synchronous_init,
bool fail_initial_download,
bool use_real_database)
: browser_sync::SyncBackendHost(
- profile->GetDebugName(), profile, sync_prefs),
+ profile->GetDebugName(), profile, sync_prefs, invalidator_storage),
synchronous_init_(synchronous_init),
fail_initial_download_(fail_initial_download),
use_real_database_(use_real_database) {}
@@ -225,6 +226,7 @@ void TestProfileSyncService::CreateBackend() {
backend_.reset(new browser_sync::SyncBackendHostForProfileSyncTest(
profile(),
sync_prefs_.AsWeakPtr(),
+ invalidator_storage_.AsWeakPtr(),
set_initial_sync_ended_on_init_,
synchronous_backend_initialization_,
fail_initial_download_,