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

chrome/browser/platform_util_win.cc

Index: chrome/browser/platform_util_win.cc
diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc
index 875863d2999124246e5f0661dace1e1b09e1d05d..24f21e10f6ea56a8a711fd2633087b3d7fb7faab 100644
--- a/chrome/browser/platform_util_win.cc
+++ b/chrome/browser/platform_util_win.cc
@@ -14,15 +14,11 @@
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "chrome/installer/util/browser_distribution.h"
-#include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/install_util.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/message_box_win.h"
 #include "ui/gfx/native_widget_types.h"
@@ -196,48 +192,6 @@ bool SimpleYesNoBox(gfx::NativeWindow parent,
       MB_YESNO | MB_ICONWARNING | MB_SETFOREGROUND) == IDYES;
 }
 
-std::string GetVersionStringModifier() {
-#if defined(GOOGLE_CHROME_BUILD)
-  FilePath module;
-  string16 channel;
-  if (PathService::Get(base::FILE_MODULE, &module)) {
-    bool is_system_install =
-        !InstallUtil::IsPerUserInstall(module.value().c_str());
-
-    GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install,
-                                                       &channel);
-  }
-  return UTF16ToASCII(channel);
-#else
-  return std::string();
-#endif
-}
-
-Channel GetChannel() {
-#if defined(GOOGLE_CHROME_BUILD)
-  std::wstring channel(L"unknown");
-
-  FilePath module;
-  if (PathService::Get(base::FILE_MODULE, &module)) {
-    bool is_system_install =
-        !InstallUtil::IsPerUserInstall(module.value().c_str());
-    channel = GoogleUpdateSettings::GetChromeChannel(is_system_install);
-  }
-
-  if (channel.empty()) {
-    return CHANNEL_STABLE;
-  } else if (channel == L"beta") {
-    return CHANNEL_BETA;
-  } else if (channel == L"dev") {
-    return CHANNEL_DEV;
-  } else if (channel == L"canary") {
-    return CHANNEL_CANARY;
-  }
-#endif
-
-  return CHANNEL_UNKNOWN;
-}
-
 bool CanSetAsDefaultBrowser() {
   return BrowserDistribution::GetDistribution()->CanSetAsDefault();
 }