Device info datatype should be moved to components/sync_driver.

chrome/browser/sync/glue/device_info.cc

Index: chrome/browser/sync/glue/device_info.cc
diff --git a/chrome/browser/sync/glue/device_info.cc b/chrome/browser/sync/glue/device_info.cc
index f3ea3602ddef8da4ffd64053a8f20d651f4c4f5f..681ffb6a6bbd9fe7e2f1bf1e1e8c9e54beeeb255 100644
--- a/chrome/browser/sync/glue/device_info.cc
+++ b/chrome/browser/sync/glue/device_info.cc
@@ -2,48 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/sync/glue/device_info.h"
-
-#include "base/command_line.h"
-#include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
-#include "chrome/common/chrome_version_info.h"
-#include "chrome/common/chrome_switches.h"
+#include "chrome/browser/sync/glue/device_info.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() {
-  return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET;
-}
-#endif
-
-// 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";
-  }
-}
-
-}  // namespace
-
 DeviceInfo::DeviceInfo(const std::string& guid,
                        const std::string& client_name,
                        const std::string& chrome_version,
@@ -133,65 +98,6 @@ bool DeviceInfo::Equals(const DeviceInfo& other) const {
          this->signin_scoped_device_id() == other.signin_scoped_device_id();
 }
 
-// static.
-sync_pb::SyncEnums::DeviceType DeviceInfo::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
-}
-
-// static
-std::string DeviceInfo::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;
-}
-
 base::DictionaryValue* DeviceInfo::ToValue() {
   base::DictionaryValue* value = new base::DictionaryValue();
   value->SetString("name", client_name_);
@@ -207,47 +113,9 @@ void DeviceInfo::set_public_id(std::string id) {
 }
 
 // static.
-void DeviceInfo::CreateLocalDeviceInfo(
-    const std::string& guid,
-    const std::string& signin_scoped_device_id,
-    base::Callback<void(const DeviceInfo& local_info)> callback) {
-  GetClientName(base::Bind(&DeviceInfo::CreateLocalDeviceInfoContinuation,
-                           guid,
-                           signin_scoped_device_id,
-                           callback));
-}
-
-// static.
 void DeviceInfo::GetClientName(
-    base::Callback<void(const std::string& client_name)> callback) {
-  syncer::GetSessionName(
-      content::BrowserThread::GetBlockingPool(),
-      base::Bind(&DeviceInfo::GetClientNameContinuation,
-                 callback));
-}
-
-void DeviceInfo::GetClientNameContinuation(
-    base::Callback<void(const std::string& local_info)> callback,
-    const std::string& session_name) {
-  callback.Run(session_name);
-}
-
-// static.
-void DeviceInfo::CreateLocalDeviceInfoContinuation(
-    const std::string& guid,
-    const std::string& signin_scoped_device_id,
-    base::Callback<void(const DeviceInfo& local_info)> callback,
-    const std::string& session_name) {
-  chrome::VersionInfo version_info;
-
-  DeviceInfo local_info(guid,
-                        session_name,
-                        version_info.CreateVersionString(),
-                        MakeUserAgentForSyncApi(version_info),
-                        GetLocalDeviceType(),
-                        signin_scoped_device_id);
-
-  callback.Run(local_info);
+    const base::Callback<void(const std::string& client_name)> callback) {

[maniscalco, 2014/09/23 16:28:27]

nit: any reason for the parameter name in the callback to differ between
declaration and definition? (client_name vs local_info).

Better yet, how about introducing a typedef

typedef base::Callback<void(const std::string& client_name)>
GetClientNameCallback;

?

[stanisc, 2014/09/23 21:30:32]

Done. Introduced the typedef you suggested. The name "local_info" ended up in
the callback definition as a result of copy&paste from the old code. Deleted it.

+  syncer::GetSessionName(content::BrowserThread::GetBlockingPool(), callback);
 }
 
 }  // namespace browser_sync