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

chrome/browser/sync/invalidations/invalidator_storage.cc

Index: chrome/browser/sync/invalidations/invalidator_storage.cc
diff --git a/chrome/browser/sync/invalidations/invalidator_storage.cc b/chrome/browser/sync/invalidations/invalidator_storage.cc
index e2eb055701f1c67c8781d6c5f750db58dee28932..e82dd0e08751366fd4c7476286baa743958a8fdd 100644
--- a/chrome/browser/sync/invalidations/invalidator_storage.cc
+++ b/chrome/browser/sync/invalidations/invalidator_storage.cc
@@ -4,6 +4,7 @@
 
 #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"
@@ -115,16 +116,19 @@ void InvalidatorStorage::SerializeMap(
 }
 
 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() {