Stop passing raw pointers to DictionaryValue::Set, part 2

chrome/browser/chromeos/display/display_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/browser/chromeos/display/display_preferences.h"
 
 #include <stddef.h>
 
 #include "ash/shell.h"
 #include "base/strings/string16.h"
@@ skipping 297 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   DictionaryPrefUpdate update(local_state, prefs::kSecondaryDisplays);
   base::DictionaryValue* pref_data = update.Get();
   std::unique_ptr<base::Value> layout_value(new base::DictionaryValue());
   if (pref_data->HasKey(name)) {
     base::Value* value = nullptr;
     if (pref_data->Get(name, &value) && value != nullptr)
       layout_value.reset(value->DeepCopy());
   }
   if (display::DisplayLayoutToJson(display_layout, layout_value.get()))
-    pref_data->Set(name, layout_value.release());
+    pref_data->Set(name, std::move(layout_value));
 }
 
 void StoreCurrentDisplayLayoutPrefs() {
   display::DisplayManager* display_manager = GetDisplayManager();
   if (!UserCanSaveDisplayPreference() ||
       display_manager->num_connected_displays() < 2) {
     return;
   }
 
   display::DisplayIdList list = display_manager->GetCurrentDisplayIdList();
@@ skipping 37 matching lines @@
           static_cast<int>(mode->device_scale_factor() * 1000));
     }
     if (!info.overscan_insets_in_dip().IsEmpty())
       InsetsToValue(info.overscan_insets_in_dip(), property_value.get());
     if (info.color_profile() != display::COLOR_PROFILE_STANDARD) {
       property_value->SetString(
           "color_profile_name", ColorProfileToString(info.color_profile()));
     }
     if (info.has_touch_calibration_data())
       TouchDataToValue(info.GetTouchCalibrationData(), property_value.get());
-    pref_data->Set(base::Int64ToString(id), property_value.release());
+    pref_data->Set(base::Int64ToString(id), std::move(property_value));
   }
 }
 
 typedef std::map<chromeos::DisplayPowerState, std::string>
     DisplayPowerStateToStringMap;
 
 const DisplayPowerStateToStringMap* GetDisplayPowerStateToStringMap() {
   // Don't save or retore ALL_OFF state. crbug.com/318456.
   static const DisplayPowerStateToStringMap* map = display::CreateToStringMap(
       chromeos::DISPLAY_POWER_ALL_ON, "all_on",
@@ skipping 104 matching lines @@
   StoreDisplayPowerState(power_state);
 }
 
 bool ParseTouchCalibrationStringForTest(
     const std::string& str,
     display::TouchCalibrationData::CalibrationPointPairQuad* point_pair_quad) {
   return ParseTouchCalibrationStringValue(str, point_pair_quad);
 }
 
 }  // namespace chromeos