Separate sync and invalidation client IDs

sync/notifier/non_blocking_invalidator_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/non_blocking_invalidator.h"
 
 #include "base/bind_helpers.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 15 matching lines @@
 
 class NonBlockingInvalidatorTestDelegate {
  public:
   NonBlockingInvalidatorTestDelegate() : io_thread_("IO thread") {}
 
   ~NonBlockingInvalidatorTestDelegate() {
     DestroyInvalidator();
   }
 
   void CreateInvalidator(
+      const std::string& invalidator_client_id,
       const std::string& initial_state,
       const base::WeakPtr<InvalidationStateTracker>&
           invalidation_state_tracker) {
     DCHECK(!invalidator_.get());
     base::Thread::Options options;
     options.message_loop_type = MessageLoop::TYPE_IO;
     io_thread_.StartWithOptions(options);
     request_context_getter_ =
         new net::TestURLRequestContextGetter(io_thread_.message_loop_proxy());
     notifier::NotifierOptions invalidator_options;
     invalidator_options.request_context_getter = request_context_getter_;
     invalidator_.reset(
         new NonBlockingInvalidator(
             invalidator_options,
+            invalidator_client_id,
             InvalidationStateMap(),
             initial_state,
             MakeWeakHandle(invalidation_state_tracker),
             "fake_client_info"));
   }
 
   Invalidator* GetInvalidator() {
     return invalidator_.get();
   }
 
@@ skipping 31 matching lines @@
   scoped_ptr<NonBlockingInvalidator> invalidator_;
 };
 
 INSTANTIATE_TYPED_TEST_CASE_P(
     NonBlockingInvalidatorTest, InvalidatorTest,
     NonBlockingInvalidatorTestDelegate);
 
 }  // namespace
 
 }  // namespace syncer