Migrate invalidator client IDs out of sync

chrome/browser/sync/invalidations/invalidator_storage_unittest.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/bind.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
@@ skipping 89 matching lines @@
   storage.SetMaxVersionAndPayload(kPreferencesId_, 5, "b");
   EXPECT_EQ(expected_states, storage.GetAllInvalidationStates());
 
   expected_states.erase(kPreferencesId_);
   syncer::ObjectIdSet to_forget;
   to_forget.insert(kPreferencesId_);
   storage.Forget(to_forget);
   EXPECT_EQ(expected_states, storage.GetAllInvalidationStates());
 }
 
-// Clearing the storage should erase all version map entries and the bootstrap
-// data.
+// Clearing the storage should erase all version map entries, bootstrap data,
+// and the client ID.
 TEST_F(InvalidatorStorageTest, Clear) {
   InvalidatorStorage storage(&pref_service_);
   EXPECT_TRUE(storage.GetAllInvalidationStates().empty());
   EXPECT_TRUE(storage.GetBootstrapData().empty());
+  EXPECT_TRUE(storage.GetInvalidatorClientId().empty());
+
+  storage.SetInvalidatorClientId("fake_id");
+  EXPECT_EQ("fake_id", storage.GetInvalidatorClientId());
 
   storage.SetBootstrapData("test");
   EXPECT_EQ("test", storage.GetBootstrapData());
+
   {
     InvalidationStateMap expected_states;
     expected_states[kAppNotificationsId_].version = 3;
     storage.SetMaxVersionAndPayload(kAppNotificationsId_, 3, std::string());
     EXPECT_EQ(expected_states, storage.GetAllInvalidationStates());
   }
 
   storage.Clear();
 
   EXPECT_TRUE(storage.GetAllInvalidationStates().empty());
   EXPECT_TRUE(storage.GetBootstrapData().empty());
+  EXPECT_TRUE(storage.GetInvalidatorClientId().empty());
 }
 
 TEST_F(InvalidatorStorageTest, SerializeEmptyMap) {
   InvalidationStateMap empty_map;
   base::ListValue list;
   InvalidatorStorage::SerializeToList(empty_map, &list);
   EXPECT_TRUE(list.empty());
 }
 
 // Make sure we don't choke on a variety of malformed input.
@@ skipping 254 matching lines @@
   const base::ListValue* list =
       pref_service_.GetList(prefs::kInvalidatorMaxInvalidationVersions);
   InvalidatorStorage::DeserializeFromList(*list, &map);
 
   EXPECT_EQ(3U, map.size());
   EXPECT_EQ(10, map[kAutofillId_].version);
   EXPECT_EQ(32, map[kBookmarksId_].version);
   EXPECT_EQ(54, map[kPreferencesId_].version);
 }
 
+TEST_F(InvalidatorStorageTest, SetGetNotifierClientId) {
+  InvalidatorStorage storage(&pref_service_);
+  const std::string client_id("fK6eDzAIuKqx9A4+93bljg==");
+
+  storage.SetInvalidatorClientId(client_id);
+  EXPECT_EQ(client_id, storage.GetInvalidatorClientId());
+}
+
 TEST_F(InvalidatorStorageTest, SetGetBootstrapData) {
   InvalidatorStorage storage(&pref_service_);
   const std::string mess("n\0tK\0\0l\344", 8);
   ASSERT_FALSE(IsStringUTF8(mess));
 
   storage.SetBootstrapData(mess);
   EXPECT_EQ(mess, storage.GetBootstrapData());
 }
 
 // Test that we correctly generate ack handles, acknowledge them, and persist
@@ skipping 66 matching lines @@
   EXPECT_TRUE(it->second.IsValid());
   state_map[kBookmarksId_].expected = it->second;
   EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
 
   storage.Acknowledge(kBookmarksId_, it->second);
   state_map[kBookmarksId_].current = it->second;
   EXPECT_EQ(state_map, storage.GetAllInvalidationStates());
 }
 
 }  // namespace browser_sync