Cleanup VersionInfo after componentization.

chrome/browser/search_engines/ui_thread_search_terms_data.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 "chrome/browser/search_engines/ui_thread_search_terms_data.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/search/search.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/base/device_form_factor.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_RLZ)
 #include "components/rlz/rlz_tracker.h"
 #endif
 
 using content::BrowserThread;
 
@@ skipping 124 matching lines @@
   // NTP is considered themed if the theme is not default and not native (GTK+).
   if (theme_service && !theme_service->UsingDefaultTheme() &&
       !theme_service->UsingSystemTheme())
     return "es_th=1&";
 #endif  // defined(ENABLE_THEMES)
 
   return std::string();
 }
 
 // It's acutally OK to call this method on any thread, but it's currently placed
-// in UIThreadSearchTermsData since SearchTermsData cannot depend on
-// VersionInfo.
+// in UIThreadSearchTermsData since SearchTermsData cannot depend on src/chrome
+// as it is shared with iOS.
 std::string UIThreadSearchTermsData::GoogleImageSearchSource() const {
-  chrome::VersionInfo version_info;
-  std::string version(version_info.Name() + " " + version_info.Version());
-  if (version_info.IsOfficialBuild())
+  std::string version(version_info::GetProductName() + " " +
+                      version_info::GetVersionNumber());
+  if (version_info::IsOfficialBuild())
     version += " (Official)";
-  version += " " + version_info.OSType();
-  std::string modifier(version_info.GetVersionStringModifier());
+  version += " " + version_info::GetOSType();
+  std::string modifier(chrome::GetChannelString());
   if (!modifier.empty())
     version += " " + modifier;
   return version;
 }
 
 std::string UIThreadSearchTermsData::GetAcceptLanguages() const {
   return profile_ ? profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)
                   : std::string();
 }
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(const std::string& base_url) {
   delete google_base_url_;
   google_base_url_ = base_url.empty() ? NULL : new std::string(base_url);
 }