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

chrome/browser/sync/glue/sync_backend_host.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 "build/build_config.h"
 
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 
 #include <algorithm>
 #include <map>
@@ skipping 1180 matching lines @@
       options.registrar /* as SyncManager::ChangeDelegate */,
       options.credentials,
 #if defined(OS_ANDROID)
       scoped_ptr<syncer::Invalidator>(
           new AndroidInvalidatorBridgeProxy(
               options.android_invalidator_bridge)),
 #else
       scoped_ptr<syncer::Invalidator>(
           options.invalidator_factory->CreateInvalidator()),
 #endif
+      options.invalidator_factory->GetInvalidatorClientId(),
       options.restored_key_for_bootstrapping,
       options.restored_keystore_key_for_bootstrapping,
       scoped_ptr<InternalComponentsFactory>(
           options.internal_components_factory),
       &encryptor_,
       options.unrecoverable_error_handler,
       options.report_unrecoverable_error_function);
 
   // |sync_manager_| may end up being NULL here in tests (in
   // synchronous initialization mode).
@@ skipping 447 matching lines @@
   DVLOG(1) << "Connection status changed: "
            << syncer::ConnectionStatusToString(status);
   frontend_->OnConnectionStatusChange(status);
 }
 
 #undef SDVLOG
 
 #undef SLOG
 
 }  // namespace browser_sync