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

sync/tools/sync_client.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 <cstddef>
 #include <cstdio>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 320 matching lines @@
                     kSyncServerAndPath,
                     kSyncServerPort,
                     kUseSsl,
                     post_factory.Pass(),
                     workers,
                     extensions_activity_monitor,
                     &change_delegate,
                     credentials,
                     scoped_ptr<Invalidator>(
                         invalidator_factory.CreateInvalidator()),
+                    invalidator_factory.GetInvalidatorClientId(),
                     kRestoredKeyForBootstrapping,
                     kRestoredKeystoreKeyForBootstrapping,
                     scoped_ptr<InternalComponentsFactory>(
                         new InternalComponentsFactoryImpl(factory_switches)),
                     &null_encryptor,
                     &unrecoverable_error_handler,
                     &LogUnrecoverableErrorContext);
   // TODO(akalin): Avoid passing in model parameters multiple times by
   // organizing handling of model types.
   sync_manager->UpdateEnabledTypes(model_types);
   sync_manager->StartSyncingNormally(routing_info);
 
   sync_loop.Run();
 
   io_thread.Stop();
   return 0;
 }
 
 }  // namespace
 }  // namespace syncer
 
 int main(int argc, char* argv[]) {
   return syncer::SyncClientMain(argc, argv);
 }