Settings Virtual Prefs: Change IsUserControlled to IsUserModifiable

CL changes incorrect usage of IsUserControlled to IsUserModifiable for
checking whether a preference could be changed by the user. Also updates
test cases that set the user preference to establish a known test state,
to instead set default preferences.

Bug: 1096471
Change-Id: I5d7fb02e438331e92d91d9d50b36b69250468667
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2250185Reviewed-by: Martin Šrámek <msramek@chromium.org>
Commit-Queue: Theodore Olsauskas-Warren <sauski@google.com>
Cr-Commit-Position: refs/heads/master@{#779799}

chrome/browser/content_settings/generated_cookie_prefs.cc

@@ -204,14 +204,14 @@ extensions::settings_private::SetPrefResult SetAllCookieSettings(
 
   auto* pref_service = profile->GetPrefs();
   if (pref_service->FindPreference(prefs::kBlockThirdPartyCookies)
-          ->IsUserControlled()) {
+          ->IsUserModifiable()) {
     pref_service->SetBoolean(
         prefs::kBlockThirdPartyCookies,
         controls_mode == CookieControlsMode::kBlockThirdParty);
     setting_changed = true;
   }
   if (pref_service->FindPreference(prefs::kCookieControlsMode)
-          ->IsUserControlled()) {
+          ->IsUserModifiable()) {
     pref_service->SetInteger(prefs::kCookieControlsMode,
                              static_cast<int>(controls_mode));
     setting_changed = true;

chrome/browser/content_settings/generated_cookie_prefs_unittest.cc

@@ -398,11 +398,11 @@ TEST_F(GeneratedCookiePrefsTest, PrimarySettingPref) {
   // Setup a baseline content setting and preference state.
   map->SetDefaultContentSetting(ContentSettingsType::COOKIES,
                                 ContentSetting::CONTENT_SETTING_ALLOW);
-  prefs->SetUserPref(prefs::kBlockThirdPartyCookies,
-                     std::make_unique<base::Value>(false));
-  prefs->SetUserPref(prefs::kCookieControlsMode,
-                     std::make_unique<base::Value>(
-                         static_cast<int>(CookieControlsMode::kOff)));
+  prefs->SetDefaultPrefValue(prefs::kBlockThirdPartyCookies,
+                             base::Value(false));
+  prefs->SetDefaultPrefValue(
+      prefs::kCookieControlsMode,
+      base::Value(static_cast<int>(CookieControlsMode::kOff)));
 
   // Check that each of the four possible preference values sets the correct
   // state and is correctly reflected in a newly returned PrefObject.