Device info datatype should be moved to components/sync_driver.

chrome/browser/sync/glue/local_device_info_provider_impl.cc

Index: chrome/browser/sync/glue/local_device_info_provider_impl.cc
diff --git a/chrome/browser/sync/glue/local_device_info_provider_impl.cc b/chrome/browser/sync/glue/local_device_info_provider_impl.cc
index 711e895ef25ba8c01c00158a0f11ee0aabff05c7..dadfb17bee08cb87b7306f4aaa3943f4c9e2e172 100644
--- a/chrome/browser/sync/glue/local_device_info_provider_impl.cc
+++ b/chrome/browser/sync/glue/local_device_info_provider_impl.cc
@@ -2,10 +2,59 @@
 // 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/chrome_version_info.h"
+#include "ui/base/device_form_factor.h"
 
 namespace browser_sync {
 
+namespace {
+
+// Converts VersionInfo::Channel to string for user-agent string.
+std::string ChannelToString(chrome::VersionInfo::Channel channel) {
+  switch (channel) {
+    case chrome::VersionInfo::CHANNEL_UNKNOWN:
+      return "unknown";
+    case chrome::VersionInfo::CHANNEL_CANARY:
+      return "canary";
+    case chrome::VersionInfo::CHANNEL_DEV:
+      return "dev";
+    case chrome::VersionInfo::CHANNEL_BETA:
+      return "beta";
+    case chrome::VersionInfo::CHANNEL_STABLE:
+      return "stable";
+    default:
+      NOTREACHED();
+      return "unknown";
+  }
+}
+
+#if defined(OS_ANDROID)
+bool IsTabletUI() {
+  return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET;
+}
+#endif
+
+sync_pb::SyncEnums::DeviceType GetLocalDeviceType() {
+#if defined(OS_CHROMEOS)
+  return sync_pb::SyncEnums_DeviceType_TYPE_CROS;
+#elif defined(OS_LINUX)
+  return sync_pb::SyncEnums_DeviceType_TYPE_LINUX;
+#elif defined(OS_MACOSX)
+  return sync_pb::SyncEnums_DeviceType_TYPE_MAC;
+#elif defined(OS_WIN)
+  return sync_pb::SyncEnums_DeviceType_TYPE_WIN;
+#elif defined(OS_ANDROID)
+  return IsTabletUI() ? sync_pb::SyncEnums_DeviceType_TYPE_TABLET
+                      : sync_pb::SyncEnums_DeviceType_TYPE_PHONE;
+#else
+  return sync_pb::SyncEnums_DeviceType_TYPE_OTHER;
+#endif
+}
+
+}  // namespace
+
 LocalDeviceInfoProviderImpl::LocalDeviceInfoProviderImpl()
     : weak_factory_(this) {
 }
@@ -13,6 +62,46 @@ LocalDeviceInfoProviderImpl::LocalDeviceInfoProviderImpl()
 LocalDeviceInfoProviderImpl::~LocalDeviceInfoProviderImpl() {
 }
 
+// static.
+std::string LocalDeviceInfoProviderImpl::MakeUserAgentForSyncApi(
+    const chrome::VersionInfo& version_info) {
+  std::string user_agent;
+  user_agent = "Chrome ";
+#if defined(OS_WIN)
+  user_agent += "WIN ";
+#elif defined(OS_CHROMEOS)
+  user_agent += "CROS ";
+#elif defined(OS_ANDROID)
+  if (IsTabletUI())
+    user_agent += "ANDROID-TABLET ";
+  else
+    user_agent += "ANDROID-PHONE ";
+#elif defined(OS_LINUX)
+  user_agent += "LINUX ";
+#elif defined(OS_FREEBSD)
+  user_agent += "FREEBSD ";
+#elif defined(OS_OPENBSD)
+  user_agent += "OPENBSD ";
+#elif defined(OS_MACOSX)
+  user_agent += "MAC ";
+#endif
+  if (!version_info.is_valid()) {
+    DLOG(ERROR) << "Unable to create chrome::VersionInfo object";
+    return user_agent;
+  }
+
+  user_agent += version_info.Version();
+  user_agent += " (" + version_info.LastChange() + ")";
+  if (!version_info.IsOfficialBuild()) {
+    user_agent += "-devel";
+  } else {
+    user_agent +=
+        " channel(" + ChannelToString(version_info.GetChannel()) + ")";
+  }
+
+  return user_agent;
+}
+
 const DeviceInfo*
 LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
   return local_device_info_.get();
@@ -33,25 +122,26 @@ void LocalDeviceInfoProviderImpl::Initialize(
     const std::string& cache_guid, const std::string& signin_scoped_device_id) {
   DCHECK(!cache_guid.empty());
   cache_guid_ = cache_guid;
-  DeviceInfo::CreateLocalDeviceInfo(
-      cache_guid_,
-      signin_scoped_device_id,
+
+  DeviceInfo::GetClientName(
       base::Bind(&LocalDeviceInfoProviderImpl::InitializeContinuation,
-                 weak_factory_.GetWeakPtr()));
+                 weak_factory_.GetWeakPtr(),
+                 cache_guid,
+                 signin_scoped_device_id));
 }
 
 void LocalDeviceInfoProviderImpl::InitializeContinuation(
-    const DeviceInfo& local_info) {
-  // Copy constructor is disallowed in DeviceInfo, construct a new one from
-  // the fields passed in local_info.
-  local_device_info_.reset(
-      new DeviceInfo(
-          local_info.guid(),
-          local_info.client_name(),
-          local_info.chrome_version(),
-          local_info.sync_user_agent(),
-          local_info.device_type(),
-          local_info.signin_scoped_device_id()));
+    const std::string& guid,
+    const std::string& signin_scoped_device_id,
+    const std::string& session_name) {
+  chrome::VersionInfo version_info;
+
+  local_device_info_.reset(new DeviceInfo(guid,
+                                          session_name,
+                                          version_info.CreateVersionString(),
+                                          MakeUserAgentForSyncApi(version_info),
+                                          GetLocalDeviceType(),
+                                          signin_scoped_device_id));
 
   // Notify observers.
   callback_list_.Notify();