sync: migrate invalidation state from syncable::Directory to InvalidationStorage

sync/notifier/invalidation_notifier.cc

Index: sync/notifier/invalidation_notifier.cc
diff --git a/sync/notifier/invalidation_notifier.cc b/sync/notifier/invalidation_notifier.cc
index 60f81cc644b2349a1c6418607bb2ea2193b7c12e..cdeaa6e2445448fea86eb0b5534fda0e3267bde4 100644
--- a/sync/notifier/invalidation_notifier.cc
+++ b/sync/notifier/invalidation_notifier.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
+#include "base/metrics/histogram.h"
 #include "jingle/notifier/base/const_communicator.h"
 #include "jingle/notifier/base/notifier_options_util.h"
 #include "net/url_request/url_request_context.h"
@@ -19,6 +20,7 @@ namespace sync_notifier {
 InvalidationNotifier::InvalidationNotifier(
     const notifier::NotifierOptions& notifier_options,
     const InvalidationVersionMap& initial_max_invalidation_versions,
+    const std::string& initial_invalidation_state,
     const browser_sync::WeakHandle<InvalidationStateTracker>&
         invalidation_state_tracker,
     const std::string& client_info)
@@ -26,7 +28,8 @@ InvalidationNotifier::InvalidationNotifier(
       notifier_options_(notifier_options),
       initial_max_invalidation_versions_(initial_max_invalidation_versions),
       invalidation_state_tracker_(invalidation_state_tracker),
-      client_info_(client_info) {
+      client_info_(client_info),
+      invalidation_state_(initial_invalidation_state) {
   DCHECK_EQ(notifier::NOTIFICATION_SERVER,
             notifier_options.notification_method);
   DCHECK(notifier_options_.request_context_getter);
@@ -56,10 +59,24 @@ void InvalidationNotifier::SetUniqueId(const std::string& unique_id) {
   CHECK(!invalidation_client_id_.empty());
 }
 
-void InvalidationNotifier::SetState(const std::string& state) {
+void InvalidationNotifier::SetStateDeprecated(const std::string& state) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
-  invalidation_state_ = state;
-  DVLOG(1) << "Setting new state";
+  DCHECK_LT(state_, STARTED);
+  if (invalidation_state_.empty()) {
+    // Migrate state from sync to invalidation state tracker (bug
+    // 124140).  We've just been handed state from the syncable::Directory, and
+    // the initial invalidation state was empty, implying we've never written
+    // to the new store. Do this here to ensure we always migrate (even if
+    // we fail to establish an initial connection or receive an initial
+    // invalidation) so that we can make the old code obsolete as soon as
+    // possible.
+    invalidation_state_ = state;
+    invalidation_state_tracker_.Call(
+        FROM_HERE, &InvalidationStateTracker::SetInvalidationState, state);
+    UMA_HISTOGRAM_BOOLEAN("InvalidationNotifier.UsefulSetState", true);
+  } else {
+    UMA_HISTOGRAM_BOOLEAN("InvalidationNotifier.UsefulSetState", false);
+  }
 }
 
 void InvalidationNotifier::UpdateCredentials(
@@ -112,7 +129,7 @@ void InvalidationNotifier::OnConnect(
         invalidation_client_id_, client_info_, invalidation_state_,
         initial_max_invalidation_versions_,
         invalidation_state_tracker_,
-        this, this, base_task);
+        this, base_task);
     invalidation_state_.clear();
     state_ = STARTED;
   }
@@ -136,10 +153,4 @@ void InvalidationNotifier::OnSessionStatusChanged(bool has_session) {
                     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