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

chrome/browser/sync/profile_sync_service_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/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 538 matching lines @@
 
   virtual void Acknowledge(const invalidation::ObjectId& id,
                            const syncer::AckHandle& ack_handle) OVERRIDE {
     // Do nothing.
   }
 
   virtual syncer::InvalidatorState GetInvalidatorState() const OVERRIDE {
     return service_->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 syncer::ObjectIdInvalidationMap& invalidation_map) OVERRIDE {
     // Do nothing.
   }
 
@@ skipping 10 matching lines @@
 // the syncer namespace (where InvalidatorTest lives).
 class ProfileSyncServiceInvalidatorTestDelegate {
  public:
   ProfileSyncServiceInvalidatorTestDelegate() {}
 
   ~ProfileSyncServiceInvalidatorTestDelegate() {
     DestroyInvalidator();
   }
 
   void CreateInvalidator(
+      const std::string& invalidation_client_id,
       const std::string& initial_state,
       const base::WeakPtr<syncer::InvalidationStateTracker>&
           invalidation_state_tracker) {
     DCHECK(!invalidator_.get());
     harness_.SetUp();
     harness_.StartSyncService();
     invalidator_.reset(
         new ProfileSyncServiceInvalidator(harness_.service.get()));
   }
 
@@ skipping 30 matching lines @@
 namespace syncer {
 namespace {
 
 // ProfileSyncService should behave just like an invalidator.
 INSTANTIATE_TYPED_TEST_CASE_P(
     ProfileSyncServiceInvalidatorTest, InvalidatorTest,
     ::browser_sync::ProfileSyncServiceInvalidatorTestDelegate);
 
 }  // namespace
 }  // namespace syncer