Separate sync and invalidation client IDs

sync/notifier/invalidator_registrar_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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "google/cacheinvalidation/types.pb.h"
 #include "sync/notifier/fake_invalidation_handler.h"
 #include "sync/notifier/invalidator_registrar.h"
@@ skipping 29 matching lines @@
   }
 
   virtual void UnregisterHandler(InvalidationHandler* handler) OVERRIDE {
     registrar_.UnregisterHandler(handler);
   }
 
   virtual InvalidatorState GetInvalidatorState() const OVERRIDE {
     return registrar_.GetInvalidatorState();
   }
 
-  virtual void SetUniqueId(const std::string& unique_id) OVERRIDE {
-    // Do nothing.
-  }
-
   virtual void UpdateCredentials(
       const std::string& email, const std::string& token) OVERRIDE {
     // Do nothing.
   }
 
   virtual void SendInvalidation(
       const ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
     // Do nothing.
   }
 
  private:
   InvalidatorRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrarInvalidator);
 };
 
 class RegistrarInvalidatorTestDelegate {
  public:
   RegistrarInvalidatorTestDelegate() {}
 
   ~RegistrarInvalidatorTestDelegate() {
     DestroyInvalidator();
   }
 
   void CreateInvalidator(
+      const std::string& invalidator_client_id,
       const std::string& initial_state,
       const base::WeakPtr<InvalidationStateTracker>&
           invalidation_state_tracker) {
     DCHECK(!invalidator_.get());
     invalidator_.reset(new RegistrarInvalidator());
   }
 
   RegistrarInvalidator* GetInvalidator() {
     return invalidator_.get();
   }
@@ skipping 70 matching lines @@
   EXPECT_DEATH({ registrar.UpdateRegisteredIds(&handler2, ids); }, "");
 
   registrar.UnregisterHandler(&handler2);
   registrar.UnregisterHandler(&handler1);
 }
 #endif  // GTEST_HAS_DEATH_TEST
 
 }  // namespace
 
 }  // namespace syncer