Cleanup VersionInfo after componentization.

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 "chrome/common/channel_info.h"
 #include "chrome/common/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)
@@ skipping 22 matching lines @@
 }  // namespace
 
 LocalDeviceInfoProviderImpl::LocalDeviceInfoProviderImpl()
     : weak_factory_(this) {
 }
 
 LocalDeviceInfoProviderImpl::~LocalDeviceInfoProviderImpl() {
 }
 
 // static.
-std::string LocalDeviceInfoProviderImpl::MakeUserAgentForSyncApi(
-    const chrome::VersionInfo& version_info) {
+std::string LocalDeviceInfoProviderImpl::MakeUserAgentForSyncApi() {
 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-  return MakeDesktopUserAgentForSync(version_info);
+  return MakeDesktopUserAgentForSync();
 #elif defined(OS_CHROMEOS)
-  return MakeUserAgentForSync(version_info, "CROS ");
+  return MakeUserAgentForSync("CROS ");
 #elif defined(OS_ANDROID)
   if (IsTabletUI())
-    return MakeUserAgentForSync(version_info, "ANDROID-TABLET ");
+    return MakeUserAgentForSync("ANDROID-TABLET ");
   else
-    return MakeUserAgentForSync(version_info, "ANDROID-PHONE ");
+    return MakeUserAgentForSync("ANDROID-PHONE ");
 #endif
 }
 
 const sync_driver::DeviceInfo*
 LocalDeviceInfoProviderImpl::GetLocalDeviceInfo() const {
   return local_device_info_.get();
 }
 
 std::string LocalDeviceInfoProviderImpl::GetLocalSyncCacheGUID() const {
   return cache_guid_;
@@ skipping 16 matching lines @@
       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 sync_driver::DeviceInfo(guid,
                                   session_name,
-                                  version_info.CreateVersionString(),
-                                  MakeUserAgentForSyncApi(version_info),
+                                  chrome::GetVersionString(),
+                                  MakeUserAgentForSyncApi(),
                                   GetLocalDeviceType(),
                                   signin_scoped_device_id));
 
   // Notify observers.
   callback_list_.Notify();
 }
 
 }  // namespace browser_sync