Cleanup VersionInfo after componentization.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

 // Copyright 2013 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 "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "ash/system/chromeos/devicetype_utils.h"
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/system/devicetype.h"
 #include "chromeos/system/version_loader.h"
 #include "components/login/localized_values_builder.h"
 #include "components/user_manager/user_manager.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
@@ skipping 232 matching lines @@
 
   if (StartupUtils::IsWebviewSigninEnabled()) {
     params.SetBoolean("useNewGaiaFlow", true);
 
     policy::BrowserPolicyConnectorChromeOS* connector =
         g_browser_process->platform_part()->browser_policy_connector_chromeos();
     std::string enterprise_domain(connector->GetEnterpriseDomain());
     if (!enterprise_domain.empty())
       params.SetString("enterpriseDomain", enterprise_domain);
 
-    chrome::VersionInfo version_info;
     params.SetString("chromeType", GetChromeType());
     params.SetString("clientId",
                      GaiaUrls::GetInstance()->oauth2_chrome_client_id());
-    params.SetString("clientVersion", version_info.Version());
+    params.SetString("clientVersion", version_info::GetVersionNumber());
     if (!platform_version.empty())
       params.SetString("platformVersion", platform_version);
-    params.SetString("releaseChannel", chrome::VersionInfo::GetChannelString());
+    params.SetString("releaseChannel", chrome::GetChannelString());
     params.SetString("endpointGen", kEndpointGen);
 
     std::string email_domain;
     if (CrosSettings::Get()->GetString(
             kAccountsPrefLoginScreenDomainAutoComplete, &email_domain) &&
         !email_domain.empty()) {
       params.SetString("emailDomain", email_domain);
     }
   } else {
     params.SetBoolean("useNewGaiaFlow", false);
@@ skipping 633 matching lines @@
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 
 }  // namespace chromeos