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

Unified Diff: sync/notifier/sync_notifier_factory.cc

Issue 10391186: Revert 137685 (broke check_deps on linux builder) - Rename InvalidationVersionTracker to Invalidati… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/notifier/sync_notifier_factory.h ('k') | sync/notifier/sync_notifier_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/notifier/sync_notifier_factory.cc
===================================================================
--- sync/notifier/sync_notifier_factory.cc (revision 137688)
+++ sync/notifier/sync_notifier_factory.cc (working copy)
@@ -17,8 +17,8 @@
SyncNotifier* CreateDefaultSyncNotifier(
const notifier::NotifierOptions& notifier_options,
const InvalidationVersionMap& initial_max_invalidation_versions,
- const browser_sync::WeakHandle<InvalidationStateTracker>&
- invalidation_state_tracker,
+ const browser_sync::WeakHandle<InvalidationVersionTracker>&
+ invalidation_version_tracker,
const std::string& client_info) {
if (notifier_options.notification_method == notifier::NOTIFICATION_P2P) {
// TODO(rlarocque): Ideally, the notification target would be
@@ -30,7 +30,7 @@
return new NonBlockingInvalidationNotifier(
notifier_options, initial_max_invalidation_versions,
- invalidation_state_tracker, client_info);
+ invalidation_version_tracker, client_info);
}
} // namespace
@@ -39,15 +39,15 @@
SyncNotifierFactory::SyncNotifierFactory(
const notifier::NotifierOptions& notifier_options,
const std::string& client_info,
- const base::WeakPtr<InvalidationStateTracker>&
- invalidation_state_tracker)
+ const base::WeakPtr<InvalidationVersionTracker>&
+ invalidation_version_tracker)
: notifier_options_(notifier_options),
client_info_(client_info),
initial_max_invalidation_versions_(
- invalidation_state_tracker.get() ?
- invalidation_state_tracker->GetAllMaxVersions() :
+ invalidation_version_tracker.get() ?
+ invalidation_version_tracker->GetAllMaxVersions() :
InvalidationVersionMap()),
- invalidation_state_tracker_(invalidation_state_tracker) {
+ invalidation_version_tracker_(invalidation_version_tracker) {
}
SyncNotifierFactory::~SyncNotifierFactory() {
@@ -60,7 +60,7 @@
#else
return CreateDefaultSyncNotifier(notifier_options_,
initial_max_invalidation_versions_,
- invalidation_state_tracker_,
+ invalidation_version_tracker_,
client_info_);
#endif
}
« no previous file with comments | « sync/notifier/sync_notifier_factory.h ('k') | sync/notifier/sync_notifier_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698