Remove kDistroDict from Preferences.

chrome/installer/util/master_preferences_unittest.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.
 //
 // Unit tests for master preferences related methods.
 
 #include "chrome/installer/util/master_preferences.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/master_preferences_constants.h"
 #include "chrome/installer/util/util_constants.h"
+#include "rlz/features/features.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // A helper class to set the "GoogleUpdateIsMachine" environment variable.
 class ScopedGoogleUpdateIsMachine {
  public:
   explicit ScopedGoogleUpdateIsMachine(const char* value)
       : env_(base::Environment::Create()) {
     env_->SetVar("GoogleUpdateIsMachine", value);
@@ skipping 50 matching lines @@
       "     \"welcome_page_on_os_upgrade_enabled\": true,\n"
       "     \"do_not_create_any_shortcuts\": true,\n"
       "     \"do_not_create_desktop_shortcut\": true,\n"
       "     \"do_not_create_quick_launch_shortcut\": true,\n"
       "     \"do_not_create_taskbar_shortcut\": true,\n"
       "     \"do_not_launch_chrome\": true,\n"
       "     \"make_chrome_default\": true,\n"
       "     \"make_chrome_default_for_user\": true,\n"
       "     \"system_level\": true,\n"
       "     \"verbose_logging\": true,\n"
-      "     \"require_eula\": true,\n"
-      "     \"ping_delay\": 40\n"
+      "     \"require_eula\": true\n"
       "  },\n"
       "  \"blah\": {\n"
       "     \"import_history\": false\n"
       "  }\n"
       "} \n";
 
   EXPECT_TRUE(base::WriteFile(prefs_file(), text,
                               static_cast<int>(strlen(text))));
   installer::MasterPreferences prefs(prefs_file());
   EXPECT_TRUE(prefs.read_from_file());
@@ skipping 20 matching lines @@
     bool value = false;
     EXPECT_TRUE(prefs.GetBool(expected_true[i], &value));
     EXPECT_TRUE(value) << expected_true[i];
   }
 
   std::string str_value;
   EXPECT_TRUE(prefs.GetString(
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &str_value));
   EXPECT_STREQ("c:\\foo", str_value.c_str());
-
-  int ping_delay = 90;
-  EXPECT_TRUE(prefs.GetInt(installer::master_preferences::kDistroPingDelay,
-                           &ping_delay));
-  EXPECT_EQ(ping_delay, 40);
 }
 
 TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
     "     \"import_search_engine\": true,\n"
     "     \"import_bookmarks\": false,\n"
     "     \"import_bookmarks_from_file\": \"\",\n"
     "     \"do_not_create_desktop_shortcut\": true,\n"
@@ skipping 30 matching lines @@
   };
 
   for (size_t i = 0; i < arraysize(missing_bools); ++i) {
     EXPECT_FALSE(prefs.GetBool(missing_bools[i], &value)) << missing_bools[i];
   }
 
   std::string str_value;
   EXPECT_FALSE(prefs.GetString(
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &str_value));
-
-  int ping_delay = 90;
-  EXPECT_FALSE(prefs.GetInt(
-      installer::master_preferences::kDistroPingDelay, &ping_delay));
-  EXPECT_EQ(ping_delay, 90);
 }
 
 TEST_F(MasterPreferencesTest, FirstRunTabs) {
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
     "     \"something here\": true\n"
     "  },\n"
     "  \"first_run_tabs\": [\n"
     "     \"http://google.com/f1\",\n"
@@ skipping 112 matching lines @@
 TEST_F(MasterPreferencesTest, TestDefaultInstallConfig) {
   std::wstringstream chrome_cmd;
   chrome_cmd << "setup.exe";
 
   base::CommandLine chrome_install(
       base::CommandLine::FromString(chrome_cmd.str()));
 
   installer::MasterPreferences pref_chrome(chrome_install);
 }
 
-TEST_F(MasterPreferencesTest, EnforceLegacyCreateAllShortcutsFalse) {
-  static const char kCreateAllShortcutsFalsePrefs[] =
+TEST_F(MasterPreferencesTest, EnforceLegacyPreferences) {
+  static const char kLegacyPrefs[] =
       "{"
       "  \"distribution\": {"
-      "     \"create_all_shortcuts\": false"
+      "     \"create_all_shortcuts\": false,\n"
+      "     \"ping_delay\": 40\n"
       "  }"
       "}";
 
-    installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
+  installer::MasterPreferences prefs(kLegacyPrefs);
 
-    bool do_not_create_desktop_shortcut = false;
-    bool do_not_create_quick_launch_shortcut = false;
-    bool do_not_create_taskbar_shortcut = false;
-    prefs.GetBool(
-        installer::master_preferences::kDoNotCreateDesktopShortcut,
-        &do_not_create_desktop_shortcut);
-    prefs.GetBool(
-        installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
-        &do_not_create_quick_launch_shortcut);
-    prefs.GetBool(
-        installer::master_preferences::kDoNotCreateTaskbarShortcut,
-        &do_not_create_taskbar_shortcut);
-    // create_all_shortcuts is a legacy preference that should only enforce
-    // do_not_create_desktop_shortcut and do_not_create_quick_launch_shortcut
-    // when set to false.
-    EXPECT_TRUE(do_not_create_desktop_shortcut);
-    EXPECT_TRUE(do_not_create_quick_launch_shortcut);
-    EXPECT_FALSE(do_not_create_taskbar_shortcut);
+  bool do_not_create_desktop_shortcut = false;
+  bool do_not_create_quick_launch_shortcut = false;
+  bool do_not_create_taskbar_shortcut = false;
+  prefs.GetBool(installer::master_preferences::kDoNotCreateDesktopShortcut,
+                &do_not_create_desktop_shortcut);
+  prefs.GetBool(installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
+                &do_not_create_quick_launch_shortcut);
+  prefs.GetBool(installer::master_preferences::kDoNotCreateTaskbarShortcut,
+                &do_not_create_taskbar_shortcut);
+  // create_all_shortcuts is a legacy preference that should only enforce
+  // do_not_create_desktop_shortcut and do_not_create_quick_launch_shortcut
+  // when set to false.
+  EXPECT_TRUE(do_not_create_desktop_shortcut);
+  EXPECT_TRUE(do_not_create_quick_launch_shortcut);
+  EXPECT_FALSE(do_not_create_taskbar_shortcut);
+
+#if BUILDFLAG(ENABLE_RLZ)
+  int rlz_ping_delay = 0;
+  EXPECT_TRUE(prefs.master_dictionary().GetInteger(prefs::kRlzPingDelaySeconds,
+                                                   &rlz_ping_delay));
+  EXPECT_EQ(40, rlz_ping_delay);
+#endif  // BUILDFLAG(ENABLE_RLZ)
 }
 
 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) {
   static const char kCreateAllShortcutsFalsePrefs[] =
       "{"
       "  \"distribution\": {"
       "     \"create_all_shortcuts\": true"
       "  }"
       "}";
 
@@ skipping 70 matching lines @@
   }
   {
     ScopedGoogleUpdateIsMachine env_setter("2");
     installer::MasterPreferences prefs(
         base::CommandLine(base::FilePath(FILE_PATH_LITERAL("setup.exe"))));
     bool value = false;
     prefs.GetBool(installer::master_preferences::kSystemLevel, &value);
     EXPECT_FALSE(value);
   }
 }