Use InstallDetails in setup.

chrome/install_static/install_util.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/install_static/install_util.h"
 
 #include <windows.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <sstream>
 
 #include "chrome/install_static/install_details.h"
 #include "chrome/install_static/install_modes.h"
 #include "chrome/install_static/policy_path_parser.h"
 #include "chrome/install_static/user_data_dir.h"
 #include "chrome_elf/nt_registry/nt_registry.h"
 
 namespace install_static {
@@ skipping 229 matching lines @@
   std::basic_istringstream<typename StringType::value_type> buffer(str);
   for (StringType token; std::getline(buffer, token, delimiter);) {
     if (trim_spaces)
       TrimT<StringType>(&token);
     tokens.push_back(token);
   }
   return tokens;
 }
 
 std::wstring ChannelFromAdditionalParameters(const InstallConstants& mode,
-                                             bool system_level) {
+                                             bool system_level,
+                                             bool from_binaries) {
   assert(kUseGoogleUpdateIntegration);
   // InitChannelInfo in google_update_settings.cc only reports a failure when
   // Chrome's ClientState key exists but that the "ap" value therein cannot be
   // read due to some reason *other* than it not being present. This should be
   // exceedingly rare. For simplicity's sake, use an empty |value| in case of
   // any error whatsoever here.
   std::wstring value;
   nt::QueryRegValueSZ(system_level ? nt::HKLM : nt::HKCU, nt::WOW6432,
-                      GetClientStateKeyPath(mode.app_guid).c_str(), kRegValueAp,
-                      &value);
+                      from_binaries
+                          ? GetBinariesClientStateKeyPath().c_str()
+                          : GetClientStateKeyPath(mode.app_guid).c_str(),
+                      kRegValueAp, &value);
 
   static constexpr wchar_t kChromeChannelBetaPattern[] = L"1?1-*";
   static constexpr wchar_t kChromeChannelBetaX64Pattern[] = L"*x64-beta*";
   static constexpr wchar_t kChromeChannelDevPattern[] = L"2?0-d*";
   static constexpr wchar_t kChromeChannelDevX64Pattern[] = L"*x64-dev*";
 
   std::transform(value.begin(), value.end(), value.begin(), ::tolower);
 
   // Empty channel names or those containing "stable" should be reported as
   // an empty string.
@@ skipping 447 matching lines @@
       Trace(L"Failed to create directory %ls, last error is %d\n",
             full_path_str, error_code);
       return false;
     }
   }
   return true;
 }
 
 // This function takes these inputs rather than accessing the module's
 // InstallDetails instance since it is used to bootstrap InstallDetails.
-std::wstring DetermineChannel(const InstallConstants& mode, bool system_level) {
+std::wstring DetermineChannel(const InstallConstants& mode,
+                              bool system_level,
+                              bool from_binaries) {
   if (!kUseGoogleUpdateIntegration)
     return std::wstring();
 
   switch (mode.channel_strategy) {
     case ChannelStrategy::UNSUPPORTED:
       assert(false);
       break;
     case ChannelStrategy::ADDITIONAL_PARAMETERS:
-      return ChannelFromAdditionalParameters(mode, system_level);
+      return ChannelFromAdditionalParameters(mode, system_level, from_binaries);
     case ChannelStrategy::FIXED:
       return mode.default_channel_name;
   }
 
   return std::wstring();
 }
 
 }  // namespace install_static