Separate invalidator and sync client ID (part 2/2)

sync/notifier/fake_invalidation_state_tracker.cc

Index: sync/notifier/fake_invalidation_state_tracker.cc
diff --git a/sync/notifier/fake_invalidation_state_tracker.cc b/sync/notifier/fake_invalidation_state_tracker.cc
index a228922b8c448ce0c2e1f3cd86a1297911d48125..6e147fe40853585e196167aa9cd9cf7da0cc827b 100644
--- a/sync/notifier/fake_invalidation_state_tracker.cc
+++ b/sync/notifier/fake_invalidation_state_tracker.cc
@@ -49,6 +49,7 @@ void FakeInvalidationStateTracker::Forget(const ObjectIdSet& ids) {
 
 void FakeInvalidationStateTracker::SetInvalidatorClientId(
     const std::string& client_id) {
+  Clear();
   invalidator_client_id_ = client_id;
 }
 
@@ -65,6 +66,12 @@ std::string FakeInvalidationStateTracker::GetBootstrapData() const {
   return bootstrap_data_;
 }
 
+void FakeInvalidationStateTracker::Clear() {
+  invalidator_client_id_ = "";
+  state_map_ = InvalidationStateMap();
+  bootstrap_data_ = "";
+}
+
 void FakeInvalidationStateTracker::GenerateAckHandles(
     const ObjectIdSet& ids,
     const scoped_refptr<base::TaskRunner>& task_runner,