Componentize chrome/common/sync_util

chrome/browser/sync/glue/local_device_info_provider_impl.cc

 // Copyright 2014 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/bind.h"
 #include "chrome/browser/sync/glue/local_device_info_provider_impl.h"
 #include "chrome/common/channel_info.h"
-#include "chrome/common/sync_util.h"
+#include "components/sync_driver/sync_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/util/get_session_name.h"
 #include "ui/base/device_form_factor.h"
 
 namespace browser_sync {
 
 namespace {
 
 #if defined(OS_ANDROID)
 bool IsTabletUI() {
@@ skipping 27 matching lines @@
 LocalDeviceInfoProviderImpl::~LocalDeviceInfoProviderImpl() {
 }
 
 const sync_driver::DeviceInfo*
 LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
   return local_device_info_.get();
 }
 
 std::string LocalDeviceInfoProviderImpl::GetSyncUserAgent() const {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-  return MakeDesktopUserAgentForSync();
+  return MakeDesktopUserAgentForSync(chrome::GetChannel());
 #elif defined(OS_CHROMEOS)
-  return MakeUserAgentForSync("CROS ");
+  return MakeUserAgentForSync("CROS ", chrome::GetChannel());
 #elif defined(OS_ANDROID)
   if (IsTabletUI()) {
-    return MakeUserAgentForSync("ANDROID-TABLET ");
+    return MakeUserAgentForSync("ANDROID-TABLET ", chrome::GetChannel());
   } else {
-    return MakeUserAgentForSync("ANDROID-PHONE ");
+    return MakeUserAgentForSync("ANDROID-PHONE ", chrome::GetChannel());
   }
 #endif
 }
 
 std::string LocalDeviceInfoProviderImpl::GetLocalSyncCacheGUID() const {
   return cache_guid_;
 }
 
 scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
 LocalDeviceInfoProviderImpl::RegisterOnInitializedCallback(
@@ skipping 25 matching lines @@
                                   chrome::GetVersionString(),
                                   GetSyncUserAgent(),
                                   GetLocalDeviceType(),
                                   signin_scoped_device_id));
 
   // Notify observers.
   callback_list_.Notify();
 }
 
 }  // namespace browser_sync