Separate sync and invalidation client IDs

sync/notifier/invalidator_test_template.h

 // 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.
 
 // This class defines tests that implementations of Invalidator should pass in
 // order to be conformant.  Here's how you use it to test your implementation.
 //
 // Say your class is called MyInvalidator.  Then you need to define a class
 // called MyInvalidatorTestDelegate in my_sync_notifier_unittest.cc like this:
 //
@@ skipping 84 matching lines @@
 class InvalidatorTest : public testing::Test {
  protected:
   InvalidatorTest()
       : id1(ipc::invalidation::ObjectSource::TEST, "a"),
         id2(ipc::invalidation::ObjectSource::TEST, "b"),
         id3(ipc::invalidation::ObjectSource::TEST, "c"),
         id4(ipc::invalidation::ObjectSource::TEST, "d") {
   }
 
   Invalidator* CreateAndInitializeInvalidator() {
-    this->delegate_.CreateInvalidator("fake_initial_state",
+    this->delegate_.CreateInvalidator("fake_invalidator_client_id",
+                                      "fake_initial_state",
                                       this->fake_tracker_.AsWeakPtr());
     Invalidator* const invalidator = this->delegate_.GetInvalidator();
 
-    invalidator->SetUniqueId("fake_id");
     this->delegate_.WaitForInvalidator();
     invalidator->UpdateCredentials("foo@bar.com", "fake_token");
     this->delegate_.WaitForInvalidator();
 
     return invalidator;
   }
 
   FakeInvalidationStateTracker fake_tracker_;
   InvalidatorTestDelegate delegate_;
 
@@ skipping 252 matching lines @@
   invalidator->UnregisterHandler(&handler);
 }
 
 REGISTER_TYPED_TEST_CASE_P(InvalidatorTest,
                            Basic, MultipleHandlers, EmptySetUnregisters,
                            GetInvalidatorStateAlwaysCurrent);
 
 }  // namespace syncer
 
 #endif  // SYNC_NOTIFIER_INVALIDATOR_TEST_TEMPLATE_H_