Revert 137685 (broke check_deps on linux builder) - Rename InvalidationVersionTracker to Invalidati…

sync/notifier/invalidation_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "sync/notifier/invalidation_notifier.h"
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options_util.h"
 #include "net/url_request/url_request_context.h"
 #include "sync/notifier/sync_notifier_observer.h"
 #include "sync/syncable/model_type_payload_map.h"
 #include "talk/xmpp/jid.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace sync_notifier {
 
 InvalidationNotifier::InvalidationNotifier(
     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)
     : state_(STOPPED),
       notifier_options_(notifier_options),
       initial_max_invalidation_versions_(initial_max_invalidation_versions),
-      invalidation_state_tracker_(invalidation_state_tracker),
+      invalidation_version_tracker_(invalidation_version_tracker),
       client_info_(client_info) {
   DCHECK_EQ(notifier::NOTIFICATION_SERVER,
             notifier_options.notification_method);
   DCHECK(notifier_options_.request_context_getter);
   // TODO(akalin): Replace NonThreadSafe checks with IO thread checks.
   DCHECK(notifier_options_.request_context_getter->GetIOMessageLoopProxy()->
       BelongsToCurrentThread());
 }
 
 InvalidationNotifier::~InvalidationNotifier() {
@@ skipping 65 matching lines @@
   DVLOG(1) << "OnConnect";
   if (state_ >= STARTED) {
     invalidation_client_.ChangeBaseTask(base_task);
   } else {
     DVLOG(1) << "First time connecting: starting invalidation client with id "
              << invalidation_client_id_ << " and client info "
              << client_info_;
     invalidation_client_.Start(
         invalidation_client_id_, client_info_, invalidation_state_,
         initial_max_invalidation_versions_,
-        invalidation_state_tracker_,
+        invalidation_version_tracker_,
         this, this, base_task);
     invalidation_state_.clear();
     state_ = STARTED;
   }
 }
 
 void InvalidationNotifier::OnDisconnect() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   DVLOG(1) << "OnDisconnect";
 }
@@ skipping 11 matching lines @@
                     OnNotificationStateChange(has_session));
 }
 
 void InvalidationNotifier::WriteState(const std::string& state) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   DVLOG(1) << "WriteState";
   FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state));
 }
 
 }  // namespace sync_notifier