Remove kDistroDict from Preferences.

chrome/installer/util/master_preferences.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/master_preferences.h"
 
 #include <stddef.h>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/variations/pref_names.h"
+#include "rlz/features/features.h"
 
 namespace {
 
 const char kFirstRunTabs[] = "first_run_tabs";
 
 base::LazyInstance<installer::MasterPreferences> g_master_preferences =
     LAZY_INSTANCE_INITIALIZER;
 
 bool GetURLFromValue(const base::Value* in_value, std::string* out_value) {
   return in_value && out_value && in_value->GetAsString(out_value);
@@ skipping 168 matching lines @@
     // Cache a pointer to the distribution dictionary.
     master_dictionary_->GetDictionary(
         installer::master_preferences::kDistroDict, &distribution_);
   }
 
   EnforceLegacyPreferences();
   return data_is_valid;
 }
 
 void MasterPreferences::EnforceLegacyPreferences() {
+  // Boolean. This is a legacy preference and should no longer be used; it is
+  // kept around so that old master_preferences which specify
+  // "create_all_shortcuts":false still enforce the new
+  // "do_not_create_(desktop|quick_launch)_shortcut" preferences. Setting this
+  // to true no longer has any impact.
+  static constexpr char kCreateAllShortcuts[] = "create_all_shortcuts";
+
   // If create_all_shortcuts was explicitly set to false, set
   // do_not_create_(desktop|quick_launch)_shortcut to true.
   bool create_all_shortcuts = true;
-  GetBool(installer::master_preferences::kCreateAllShortcuts,
-          &create_all_shortcuts);
+  GetBool(kCreateAllShortcuts, &create_all_shortcuts);
   if (!create_all_shortcuts) {
     distribution_->SetBoolean(
         installer::master_preferences::kDoNotCreateDesktopShortcut, true);
     distribution_->SetBoolean(
         installer::master_preferences::kDoNotCreateQuickLaunchShortcut, true);
   }
+
+#if BUILDFLAG(ENABLE_RLZ)
+  // Map the RLZ ping delay shipped in the distribution dictionary into real
+  // prefs.
+  static constexpr char kDistroPingDelay[] = "ping_delay";
+  int rlz_ping_delay = 0;
+  if (GetInt(kDistroPingDelay, &rlz_ping_delay))
+    master_dictionary_->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
+#endif  // BUILDFLAG(ENABLE_RLZ)
 }
 
 bool MasterPreferences::GetBool(const std::string& name, bool* value) const {
   bool ret = false;
   if (distribution_)
     ret = distribution_->GetBoolean(name, value);
   return ret;
 }
 
 bool MasterPreferences::GetInt(const std::string& name, int* value) const {
@@ skipping 43 matching lines @@
   }
   return result;
 }
 
 // static
 const MasterPreferences& MasterPreferences::ForCurrentProcess() {
   return g_master_preferences.Get();
 }
 
 }  // namespace installer