Use InstallDetails in installer_util.

chrome/installer/util/google_update_settings.cc

 // Copyright (c) 2012 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/installer/util/google_update_settings.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/win/registry.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/app_registration_data.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installation_state.h"
 #include "chrome/installer/util/product.h"
 
 using base::win::RegKey;
 using installer::InstallationState;
 
@@ skipping 123 matching lines @@
 // failure.
 bool InitChannelInfo(bool system_install,
                      installer::ChannelInfo* channel_info) {
   HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   RegKey key(root_key, dist->GetStateKey().c_str(),
              KEY_QUERY_VALUE | KEY_WOW64_32KEY);
   return channel_info->Initialize(key);
 }
 
-bool GetChromeChannelInternal(bool system_install,
-                              base::string16* channel) {
-  // Shortcut in case this distribution knows what channel it is (canary).
-  if (BrowserDistribution::GetDistribution()->GetChromeChannel(channel))
-    return true;
-
-  installer::ChannelInfo channel_info;
-  if (!InitChannelInfo(system_install, &channel_info)) {
-    channel->assign(installer::kChromeChannelUnknown);
-    return false;
-  }
-
-  if (!channel_info.GetChannelName(channel))
-    channel->assign(installer::kChromeChannelUnknown);
-
-  return true;
-}
-
 #if defined(GOOGLE_CHROME_BUILD)
 // Populates |update_policy| with the UpdatePolicy enum value corresponding to a
 // DWORD read from the registry and returns true if |value| is within range.
 // If |value| is out of range, returns false without modifying |update_policy|.
 bool GetUpdatePolicyFromDword(
     const DWORD value,
     GoogleUpdateSettings::UpdatePolicy* update_policy) {
   switch (value) {
     case GoogleUpdateSettings::UPDATES_DISABLED:
     case GoogleUpdateSettings::AUTOMATIC_UPDATES:
     case GoogleUpdateSettings::MANUAL_UPDATES_ONLY:
     case GoogleUpdateSettings::AUTO_UPDATES_ONLY:
       *update_policy = static_cast<GoogleUpdateSettings::UpdatePolicy>(value);
       return true;
     default:
       LOG(WARNING) << "Unexpected update policy override value: " << value;
   }
   return false;
 }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
 }  // namespace
 
 bool GoogleUpdateSettings::IsSystemInstall() {
-  bool system_install = false;
-  base::FilePath module_dir;
-  if (!PathService::Get(base::DIR_MODULE, &module_dir)) {
-    LOG(WARNING)
-        << "Failed to get directory of module; assuming per-user install.";
-  } else {
-    system_install = !InstallUtil::IsPerUserInstall(module_dir);
-  }
-  return system_install;
+  // TODO(grt): Remove this unused argument.
+  base::FilePath unused;
+  return !InstallUtil::IsPerUserInstall(unused);
 }
 
 bool GoogleUpdateSettings::GetCollectStatsConsent() {
   return GetCollectStatsConsentAtLevel(IsSystemInstall());
 }
 
 bool GoogleUpdateSettings::SetCollectStatsConsent(bool consented) {
   return SetCollectStatsConsentAtLevel(IsSystemInstall(), consented);
 }
 
@@ skipping 194 matching lines @@
 }
 
 bool GoogleUpdateSettings::UpdateDidRunState(bool did_run) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   return WriteGoogleUpdateStrKeyInternal(dist->GetAppRegistrationData(),
                                          google_update::kRegDidRunField,
                                          did_run ? L"1" : L"0");
 }
 
 base::string16 GoogleUpdateSettings::GetChromeChannel(bool system_install) {
-  base::string16 channel;
-  GetChromeChannelInternal(system_install, &channel);
-  return channel;
+  return install_static::GetChromeChannelName();
 }
 
 void GoogleUpdateSettings::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type, int install_return_code,
     const base::string16& product_guid) {
   DCHECK(archive_type != installer::UNKNOWN_ARCHIVE_TYPE ||
          install_return_code != 0);
   HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
   RegKey key;
@@ skipping 493 matching lines @@
   }
 
   // If the key or value was not present, return the empty string.
   if (result == ERROR_FILE_NOT_FOUND || result == ERROR_PATH_NOT_FOUND) {
     experiment_labels->clear();
     return true;
   }
 
   return result == ERROR_SUCCESS;
 }