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

chrome/browser/platform_util_win.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/platform_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include "app/win/scoped_co_mem.h"
 #include "app/win/shell.h"
 #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"
 
 namespace platform_util {
 
 void ShowItemInFolder(const FilePath& full_path) {
   FilePath dir = full_path.DirName();
   // ParseDisplayName will fail if the directory is "C:", it must be "C:\\".
   if (dir.value() == L"" || !file_util::EnsureEndsWithSeparator(&dir))
@@ skipping 153 matching lines @@
                  MB_OK | MB_SETFOREGROUND | MB_ICONWARNING | MB_TOPMOST);
 }
 
 bool SimpleYesNoBox(gfx::NativeWindow parent,
                     const string16& title,
                     const string16& message) {
   return ui::MessageBox(parent, message.c_str(), title.c_str(),
       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();
 }
 
 bool CanSetAsDefaultProtocolClient(const std::string& protocol) {
   return CanSetAsDefaultBrowser();
 }
 
 }  // namespace platform_util