Separate sync and invalidation client IDs

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 2af5db563da5e51ef046774be095b351ec0a3e24..39a646855216fc1c7fa77b1597ae187e1252e058 100644
--- a/sync/notifier/fake_invalidation_state_tracker.cc
+++ b/sync/notifier/fake_invalidation_state_tracker.cc
@@ -47,6 +47,15 @@ void FakeInvalidationStateTracker::Forget(const ObjectIdSet& ids) {
   }
 }
 
+void FakeInvalidationStateTracker::SetInvalidatorClientId(
+    const std::string& client_id) {
+  invalidator_client_id_ = client_id;
+}
+
+std::string FakeInvalidationStateTracker::GetInvalidatorClientId() const {
+  return invalidator_client_id_;
+}
+
 void FakeInvalidationStateTracker::SetBootstrapData(
     const std::string& data) {
   bootstrap_data_ = data;
@@ -56,6 +65,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,