Separate sync and invalidation client IDs

sync/notifier/invalidation_notifier_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 "sync/notifier/invalidation_notifier.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "jingle/notifier/base/fake_base_task.h"
 #include "jingle/notifier/base/notifier_options.h"
@@ skipping 15 matching lines @@
 
 class InvalidationNotifierTestDelegate {
  public:
   InvalidationNotifierTestDelegate() {}
 
   ~InvalidationNotifierTestDelegate() {
     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 InvalidationNotifier(
             scoped_ptr<notifier::PushClient>(new notifier::FakePushClient()),
+            invalidator_client_id,
             InvalidationStateMap(),
             initial_state,
             MakeWeakHandle(invalidation_state_tracker),
             "fake_client_info"));
   }
 
   Invalidator* GetInvalidator() {
     return invalidator_.get();
   }
 
@@ skipping 27 matching lines @@
   scoped_ptr<InvalidationNotifier> invalidator_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     InvalidationNotifierTest, InvalidatorTest,
     InvalidationNotifierTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer