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

chrome/browser/sync/invalidations/invalidator_storage.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 "chrome/browser/sync/invalidations/invalidator_storage.h"
 
+#include "base/base64.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 
 using sync_notifier::InvalidationVersionMap;
 
 namespace browser_sync {
 
@@ skipping 91 matching lines @@
   // DictionaryValue.
   for (InvalidationVersionMap::const_iterator it = map.begin();
        it != map.end(); ++it) {
     to_dict->SetString(
         base::IntToString(it->first),
         base::Int64ToString(it->second));
   }
 }
 
 std::string InvalidatorStorage::GetInvalidationState() const {
-  DLOG(WARNING) << "TODO(tim): Wire this up. Bug 124140.";
-  return pref_service_ ?
-      pref_service_->GetString(prefs::kInvalidatorInvalidationState) : "";
+  std::string utf8_state(pref_service_ ?
+      pref_service_->GetString(prefs::kInvalidatorInvalidationState) : "");
+  std::string state_data;
+  base::Base64Decode(utf8_state, &state_data);
+  return state_data;
 }
 
 void InvalidatorStorage::SetInvalidationState(const std::string& state) {
-  DLOG(WARNING) << "TODO(tim): Wire this up. Bug 124140.";
   DCHECK(non_thread_safe_.CalledOnValidThread());
+  std::string utf8_state;
+  base::Base64Encode(state, &utf8_state);
   pref_service_->SetString(prefs::kInvalidatorInvalidationState,
-                           state);
+                           utf8_state);
 }
 
 void InvalidatorStorage::Clear() {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   pref_service_->ClearPref(prefs::kInvalidatorInvalidationState);
   pref_service_->ClearPref(prefs::kSyncMaxInvalidationVersions);
 }
 
 }  // namespace browser_sync