Update PrefService::SetDefaultPrefValue() to new base::Value APIs.

The existing implementation took a raw base::Value* pointer and depended
on a comment to explain ownership semantics.

Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I79aeea59537056350bb87f37ca2f458b28f46484
Reviewed-on: https://chromium-review.googlesource.com/722352
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Reviewed-by: Ryan Sleevi <rsleevi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509989}

chrome/browser/devtools/device/devtools_android_bridge.cc

@@ -168,11 +168,11 @@ DevToolsAndroidBridge::DevToolsAndroidBridge(
   pref_change_registrar_.Add(prefs::kDevToolsDiscoverTCPTargetsEnabled,
       base::Bind(&DevToolsAndroidBridge::CreateDeviceProviders,
                  base::Unretained(this)));
-  base::ListValue* target_discovery = new base::ListValue();
-  target_discovery->AppendString(kChromeDiscoveryURL);
-  target_discovery->AppendString(kNodeDiscoveryURL);
-  profile->GetPrefs()->SetDefaultPrefValue(
-      prefs::kDevToolsTCPDiscoveryConfig, target_discovery);
+  base::Value target_discovery(base::Value::Type::LIST);
+  target_discovery.GetList().emplace_back(kChromeDiscoveryURL);
+  target_discovery.GetList().emplace_back(kNodeDiscoveryURL);
+  profile->GetPrefs()->SetDefaultPrefValue(prefs::kDevToolsTCPDiscoveryConfig,
+                                           std::move(target_discovery));
   CreateDeviceProviders();
 }
 

chrome/browser/io_thread.cc

@@ -352,10 +352,9 @@ IOThread::IOThread(
           local_state,
           BrowserThread::GetTaskRunnerForThread(BrowserThread::IO)));
 
-  base::Value* dns_client_enabled_default =
-      new base::Value(base::FeatureList::IsEnabled(features::kAsyncDns));
-  local_state->SetDefaultPrefValue(prefs::kBuiltInDnsClientEnabled,
-                                   dns_client_enabled_default);
+  local_state->SetDefaultPrefValue(
+      prefs::kBuiltInDnsClientEnabled,
+      base::Value(base::FeatureList::IsEnabled(features::kAsyncDns)));
 
   dns_client_enabled_.Init(prefs::kBuiltInDnsClientEnabled,
                            local_state,
@@ -364,11 +363,9 @@ IOThread::IOThread(
   dns_client_enabled_.MoveToThread(io_thread_proxy);
 
 #if defined(OS_POSIX)
-  base::Value* ntlm_v2_enabled_default =
-      new base::Value(base::FeatureList::IsEnabled(features::kNtlmV2Enabled));
-  local_state->SetDefaultPrefValue(prefs::kNtlmV2Enabled,
-                                   ntlm_v2_enabled_default);
-
+  local_state->SetDefaultPrefValue(
+      prefs::kNtlmV2Enabled,
+      base::Value(base::FeatureList::IsEnabled(features::kNtlmV2Enabled)));
   ntlm_v2_enabled_.Init(
       prefs::kNtlmV2Enabled, local_state,
       base::Bind(&IOThread::UpdateNtlmV2Enabled, base::Unretained(this)));

chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc

@@ -35,7 +35,7 @@ class ChromeMetricsServiceAccessorTest : public testing::Test {
 TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
 #if defined(GOOGLE_CHROME_BUILD)
   const char* pref = metrics::prefs::kMetricsReportingEnabled;
-  GetLocalState()->SetDefaultPrefValue(pref, new base::Value(false));
+  GetLocalState()->SetDefaultPrefValue(pref, base::Value(false));
 
   GetLocalState()->SetBoolean(pref, false);
   EXPECT_FALSE(

components/prefs/pref_registry.cc

@@ -38,15 +38,15 @@ PrefRegistry::const_iterator PrefRegistry::end() const {
 }
 
 void PrefRegistry::SetDefaultPrefValue(const std::string& pref_name,
-                                       base::Value* value) {
-  DCHECK(value);
-  const base::Value* current_value = NULL;
+                                       base::Value value) {
+  const base::Value* current_value = nullptr;
   DCHECK(defaults_->GetValue(pref_name, &current_value))
       << "Setting default for unregistered pref: " << pref_name;
-  DCHECK(value->IsType(current_value->type()))
+  DCHECK(value.IsType(current_value->type()))
       << "Wrong type for new default: " << pref_name;
 
-  defaults_->ReplaceDefaultValue(pref_name, base::WrapUnique(value));
+  defaults_->ReplaceDefaultValue(
+      pref_name, std::make_unique<base::Value>(std::move(value)));
 }
 
 void PrefRegistry::SetDefaultForeignPrefValue(

components/prefs/pref_registry.h

@@ -69,10 +69,10 @@ class COMPONENTS_PREFS_EXPORT PrefRegistry
   const_iterator begin() const;
   const_iterator end() const;
 
-  // Changes the default value for a preference. Takes ownership of |value|.
+  // Changes the default value for a preference.
   //
   // |pref_name| must be a previously registered preference.
-  void SetDefaultPrefValue(const std::string& pref_name, base::Value* value);
+  void SetDefaultPrefValue(const std::string& pref_name, base::Value value);
 
   // Registers a pref owned by another service for use with the current service.
   // The owning service must register that pref with the |PUBLIC| flag.

components/prefs/pref_service.cc

@@ -29,15 +29,18 @@ namespace {
 
 class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate {
  public:
-  ReadErrorHandler(base::Callback<void(PersistentPrefStore::PrefReadError)> cb)
-      : callback_(cb) {}
+  using ErrorCallback =
+      base::Callback<void(PersistentPrefStore::PrefReadError)>;
+  explicit ReadErrorHandler(ErrorCallback cb) : callback_(cb) {}
 
   void OnError(PersistentPrefStore::PrefReadError error) override {
     callback_.Run(error);
   }
 
  private:
-  base::Callback<void(PersistentPrefStore::PrefReadError)> callback_;
+  ErrorCallback callback_;
+
+  DISALLOW_COPY_AND_ASSIGN(ReadErrorHandler);
 };
 
 // Returns the WriteablePrefStore::PrefWriteFlags for the pref with the given
@@ -323,9 +326,9 @@ const base::Value* PrefService::GetUserPrefValue(
 }
 
 void PrefService::SetDefaultPrefValue(const std::string& path,
-                                      base::Value* value) {
+                                      base::Value value) {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-  pref_registry_->SetDefaultPrefValue(path, value);
+  pref_registry_->SetDefaultPrefValue(path, std::move(value));
 }
 
 const base::Value* PrefService::GetDefaultPrefValue(
@@ -558,7 +561,7 @@ base::Value::Type PrefService::Preference::GetType() const {
 }
 
 const base::Value* PrefService::Preference::GetValue() const {
-  const base::Value* result= pref_service_->GetPreferenceValue(name_);
+  const base::Value* result = pref_service_->GetPreferenceValue(name_);
   DCHECK(result) << "Must register pref before getting its value";
   return result;
 }

components/prefs/pref_service.h

@@ -248,11 +248,11 @@ class COMPONENTS_PREFS_EXPORT PrefService {
   // the preference is not set in the user pref store, returns NULL.
   const base::Value* GetUserPrefValue(const std::string& path) const;
 
-  // Changes the default value for a preference. Takes ownership of |value|.
+  // Changes the default value for a preference.
   //
   // Will cause a pref change notification to be fired if this causes
   // the effective value to change.
-  void SetDefaultPrefValue(const std::string& path, base::Value* value);
+  void SetDefaultPrefValue(const std::string& path, base::Value value);
 
   // Returns the default value of the given preference. |path| must point to a
   // registered preference. In that case, will never return nullptr, so callers

components/ssl_config/ssl_config_service_manager_pref.cc

@@ -195,38 +195,31 @@ SSLConfigServiceManagerPref::SSLConfigServiceManagerPref(
 
   const std::string tls13_variant =
       base::GetFieldTrialParamValue(kTLS13VariantExperimentName, "variant");
+  const char* tls13_value = nullptr;
+  const char* experiment_value = nullptr;
   if (tls13_variant == "disabled") {
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kTLS13Variant,
-        new base::Value(switches::kTLS13VariantDisabled));
+    tls13_value = switches::kTLS13VariantDisabled;
   } else if (tls13_variant == "draft") {
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kTLS13Variant,
-        new base::Value(switches::kTLS13VariantDraft));
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kSSLVersionMax,
-        new base::Value(switches::kSSLVersionTLSv13));
+    tls13_value = switches::kTLS13VariantDraft;
+    experiment_value = switches::kSSLVersionTLSv13;
   } else if (tls13_variant == "experiment") {
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kTLS13Variant,
-        new base::Value(switches::kTLS13VariantExperiment));
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kSSLVersionMax,
-        new base::Value(switches::kSSLVersionTLSv13));
+    tls13_value = switches::kTLS13VariantExperiment;
+    experiment_value = switches::kSSLVersionTLSv13;
   } else if (tls13_variant == "experiment2") {
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kTLS13Variant,
-        new base::Value(switches::kTLS13VariantExperiment2));
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kSSLVersionMax,
-        new base::Value(switches::kSSLVersionTLSv13));
+    tls13_value = switches::kTLS13VariantExperiment2;
+    experiment_value = switches::kSSLVersionTLSv13;
   } else if (tls13_variant == "experiment3") {
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kTLS13Variant,
-        new base::Value(switches::kTLS13VariantExperiment3));
-    local_state->SetDefaultPrefValue(
-        ssl_config::prefs::kSSLVersionMax,
-        new base::Value(switches::kSSLVersionTLSv13));
+    tls13_value = switches::kTLS13VariantExperiment3;
+    experiment_value = switches::kSSLVersionTLSv13;
+  }
+
+  if (tls13_value) {
+    local_state->SetDefaultPrefValue(ssl_config::prefs::kTLS13Variant,
+                                     base::Value(tls13_value));
+  }
+  if (experiment_value) {
+    local_state->SetDefaultPrefValue(ssl_config::prefs::kSSLVersionMax,
+                                     base::Value(experiment_value));
   }
 
   PrefChangeRegistrar::NamedChangeCallback local_state_callback =

ios/chrome/browser/metrics/ios_chrome_metrics_service_accessor_unittest.cc

@@ -30,7 +30,7 @@ class IOSChromeMetricsServiceAccessorTest : public PlatformTest {
 TEST_F(IOSChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
 #if defined(GOOGLE_CHROME_BUILD)
   const char* pref = metrics::prefs::kMetricsReportingEnabled;
-  GetLocalState()->SetDefaultPrefValue(pref, new base::Value(false));
+  GetLocalState()->SetDefaultPrefValue(pref, base::Value(false));
 
   GetLocalState()->SetBoolean(pref, false);
   EXPECT_FALSE(