Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_*

chrome/browser/ui/views/about_chrome_view.cc

 // Copyright (c) 2011 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/views/about_chrome_view.h"
 
 #if defined(OS_WIN)
 #include <commdlg.h>
 #endif  // defined(OS_WIN)
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/user_metrics.h"
 #include "grit/chromium_strings.h"
@@ skipping 111 matching lines @@
   if (!version_info.is_valid()) {
     NOTREACHED() << L"Failed to initialize about window";
     return;
   }
 
   current_version_ = version_info.Version();
 
   // This code only runs as a result of the user opening the About box so
   // doing registry access to get the version string modifier should be fine.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
-  std::string version_modifier = platform_util::GetVersionStringModifier();
+  std::string version_modifier =
+      chrome::VersionInfo::GetVersionStringModifier();
   if (!version_modifier.empty())
     version_details_ += " " + version_modifier;
 
 #if !defined(GOOGLE_CHROME_BUILD)
   version_details_ += " (";
   version_details_ += l10n_util::GetStringUTF8(
       version_info.IsOfficialBuild() ?
       IDS_ABOUT_VERSION_OFFICIAL : IDS_ABOUT_VERSION_UNOFFICIAL);
   version_details_ += " ";
   version_details_ += version_info.LastChange();
@@ skipping 616 matching lines @@
   // We have updated controls on the parent, so we need to update its layout.
   parent()->Layout();
 
   // Check button may have appeared/disappeared. We cannot call this during
   // ViewHierarchyChanged because the view hasn't been added to a Widget yet.
   if (GetWidget())
     GetDialogClientView()->UpdateDialogButtons();
 }
 
 #endif