Proper EULA handling for quick-enable.

chrome/installer/util/google_update_settings.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/installer/util/google_update_settings.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 253 matching lines @@
   return ReadGoogleUpdateStrKey(google_update::kRegMetricsId, metrics_id);
 }
 
 bool GoogleUpdateSettings::SetMetricsId(const std::wstring& metrics_id) {
   return WriteGoogleUpdateStrKey(google_update::kRegMetricsId, metrics_id);
 }
 
 // EULA consent is only relevant for system-level installs.
 bool GoogleUpdateSettings::SetEULAConsent(
     const InstallationState& machine_state,
+    BrowserDistribution* dist,
     bool consented) {
+  DCHECK(dist);
   const DWORD eula_accepted = consented ? 1 : 0;
-  // This magical method will return the right instance based on such details as
-  // whether or not --chrome-frame is present on the command-line.
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring reg_path = dist->GetStateMediumKey();
   bool succeeded = true;
   RegKey key;
 
   // Write the consent value into the product's ClientStateMedium key.
   if (key.Create(HKEY_LOCAL_MACHINE, reg_path.c_str(),
                  KEY_SET_VALUE) != ERROR_SUCCESS ||
       key.WriteValue(google_update::kRegEULAAceptedField,
                      eula_accepted) != ERROR_SUCCESS) {
     succeeded = false;
@@ skipping 260 matching lines @@
       GetUpdatePolicyFromDword(value, &update_policy);
     }
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   if (is_overridden != NULL)
     *is_overridden = found_override;
 
   return update_policy;
 }