diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 18:15:53 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-17 18:15:53 +0000 |
| commit | b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48 (patch) | |
| tree | 3646d72518c6b73b916132cf25e45b0f65a14a39 /chrome/browser/sync | |
| parent | 74a5da941800db7be37bba080d5b6a351ccc47e1 (diff) | |
| download | chromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.zip chromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.tar.gz chromium_src-b62f3e2d6dd96598cb1c46fa8a204ab76aad1a48.tar.bz2 | |
Revert 137685 (broke check_deps on linux builder) - Rename InvalidationVersionTracker to InvalidationStateTracker in preparation
to add more methods to that class.
BUG=124140
Review URL: https://chromiumcodereview.appspot.com/10407014
TBR=munjal@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10391186
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/glue/sync_backend_host.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/sync_prefs.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index 94f30f0..d9221fb 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -312,7 +312,7 @@ SyncBackendHost::SyncBackendHost(Profile* profile) ParseNotifierOptions(*CommandLine::ForCurrentProcess(), profile_->GetRequestContext()), content::GetUserAgent(GURL()), - base::WeakPtr<sync_notifier::InvalidationStateTracker>()), + base::WeakPtr<sync_notifier::InvalidationVersionTracker>()), frontend_(NULL) { } diff --git a/chrome/browser/sync/sync_prefs.h b/chrome/browser/sync/sync_prefs.h index d2cc6ad..b0c7014 100644 --- a/chrome/browser/sync/sync_prefs.h +++ b/chrome/browser/sync/sync_prefs.h @@ -14,7 +14,7 @@ #include "base/time.h" #include "chrome/browser/prefs/pref_member.h" #include "content/public/browser/notification_observer.h" -#include "sync/notifier/invalidation_state_tracker.h" +#include "sync/notifier/invalidation_version_tracker.h" #include "sync/syncable/model_type.h" class PrefService; @@ -45,7 +45,7 @@ class SyncPrefObserver { // sync_setup_wizard_unittest.cc // two_client_preferences_sync_test.cc class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, - public sync_notifier::InvalidationStateTracker, + public sync_notifier::InvalidationVersionTracker, public content::NotificationObserver { public: // |pref_service| may be NULL (for unit tests), but in that case no @@ -106,7 +106,7 @@ class SyncPrefs : public base::SupportsWeakPtr<SyncPrefs>, void SetSpareBootstrapToken(const std::string& token); #endif - // InvalidationStateTracker implementation. + // InvalidationVersionTracker implementation. virtual sync_notifier::InvalidationVersionMap GetAllMaxVersions() const OVERRIDE; virtual void SetMaxVersion(syncable::ModelType model_type, |