Device info datatype should be moved to components/sync_driver.

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/chrome_version_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 {
 
 // Converts VersionInfo::Channel to string for user-agent string.
 std::string ChannelToString(chrome::VersionInfo::Channel channel) {
   switch (channel) {
     case chrome::VersionInfo::CHANNEL_UNKNOWN:
@@ skipping 77 matching lines @@
   if (!version_info.IsOfficialBuild()) {
     user_agent += "-devel";
   } else {
     user_agent +=
         " channel(" + ChannelToString(version_info.GetChannel()) + ")";
   }
 
   return user_agent;
 }
 
-const DeviceInfo*
+const sync_driver::DeviceInfo*
 LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
   return local_device_info_.get();
 }
 
 std::string LocalDeviceInfoProviderImpl::GetLocalSyncCacheGUID() const {
   return cache_guid_;
 }
 
-scoped_ptr<LocalDeviceInfoProvider::Subscription>
+scoped_ptr<sync_driver::LocalDeviceInfoProvider::Subscription>
 LocalDeviceInfoProviderImpl::RegisterOnInitializedCallback(
     const base::Closure& callback) {
   DCHECK(!local_device_info_.get());
   return callback_list_.Add(callback);
 }
 
 void LocalDeviceInfoProviderImpl::Initialize(
     const std::string& cache_guid, const std::string& signin_scoped_device_id) {
   DCHECK(!cache_guid.empty());
   cache_guid_ = cache_guid;
 
-  DeviceInfo::GetClientName(
+  syncer::GetSessionName(
+      content::BrowserThread::GetBlockingPool(),
       base::Bind(&LocalDeviceInfoProviderImpl::InitializeContinuation,
                  weak_factory_.GetWeakPtr(),
                  cache_guid,
                  signin_scoped_device_id));
 }
 
 void LocalDeviceInfoProviderImpl::InitializeContinuation(
     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));
+  local_device_info_.reset(
+      new sync_driver::DeviceInfo(guid,
+                                  session_name,
+                                  version_info.CreateVersionString(),
+                                  MakeUserAgentForSyncApi(version_info),
+                                  GetLocalDeviceType(),
+                                  signin_scoped_device_id));
 
   // Notify observers.
   callback_list_.Notify();
 }
 
 }  // namespace browser_sync
-