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

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/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
@@ skipping 245 matching lines @@
     if (!syncer::RealModelTypeToObjectId(model_type, &id)) {
       DLOG(WARNING) << "Invalid model type: " << model_type;
       continue;
     }
     (*map)[id].version = max_version;
   }
 }
 
 void InvalidatorStorage::SetInvalidatorClientId(const std::string& client_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  Clear();  // We can't reuse our old invalidation state if the ID changes.
   pref_service_->SetString(prefs::kInvalidatorClientId, client_id);
 }
 
 std::string InvalidatorStorage::GetInvalidatorClientId() const {
   return pref_service_ ?
       pref_service_->GetString(prefs::kInvalidatorClientId) :
           std::string();
 }
 
 void InvalidatorStorage::SetBootstrapData(const std::string& data) {
@@ skipping 56 matching lines @@
     return;
   it->second.current = ack_handle;
 
   base::ListValue state_map_list;
   SerializeToList(state_map, &state_map_list);
   pref_service_->Set(prefs::kInvalidatorMaxInvalidationVersions,
                      state_map_list);
 }
 
 }  // namespace browser_sync