Convert ScopedVector<DisplayPlacement> to std::vector<DisplayPlacement>

ash/display/json_converter.cc

 // Copyright 2016 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 "ash/display/json_converter.h"
 
 #include <string>
 
 #include "ash/display/display_layout.h"
 #include "ash/display/display_pref_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 
 namespace ash {
 
 namespace {
 
 // Persistent key names
 const char kMirroredKey[] = "mirrored";
 const char kDefaultUnifiedKey[] = "default_unified";
@@ skipping 10 matching lines @@
   const base::DictionaryValue* dict_value = nullptr;
   if (!value.GetAsDictionary(&dict_value))
     return false;
   int offset;
   if (dict_value->GetInteger(kOffsetKey, &offset)) {
     DisplayPlacement::Position position;
     std::string position_str;
     if (!dict_value->GetString(kPositionKey, &position_str))
       return false;
     DisplayPlacement::StringToPosition(position_str, &position);
-    layout->placement_list.push_back(new DisplayPlacement(position, offset));
+    layout->placement_list.emplace_back(position, offset);
   }
   return true;
 }
 
 // Returns true if
 //     The key is missing - output is left unchanged
 //     The key matches the type - output is updated to the value.
 template <typename Getter, typename Output>
 bool UpdateFromDict(const base::DictionaryValue* dict_value,
                     const std::string& field_name,
@@ skipping 51 matching lines @@
   std::string value;
   if (!UpdateFromDict(dict_value, field_name, getter, &value))
     return false;
 
   return value.empty() ? true : base::StringToInt64(value, output);
 }
 
 template <>
 bool UpdateFromDict(const base::DictionaryValue* dict_value,
                     const std::string& field_name,
-                    ScopedVector<DisplayPlacement>* output) {
+                    std::vector<DisplayPlacement>* output) {
   bool (base::Value::*getter)(const base::ListValue**) const =
       &base::Value::GetAsList;
   const base::ListValue* list = nullptr;
   if (!UpdateFromDict(dict_value, field_name, getter, &list))
     return false;
 
   if (list == nullptr)
     return true;
 
   output->reserve(list->GetSize());
   for (const auto& list_item : *list) {
     const base::DictionaryValue* item_values = nullptr;
     if (!list_item->GetAsDictionary(&item_values))
       return false;
 
-    scoped_ptr<DisplayPlacement> item(new DisplayPlacement);
-    if (!UpdateFromDict(item_values, kOffsetKey, &item->offset) ||
-        !UpdateFromDict(item_values, kPositionKey, &item->position) ||
+    DisplayPlacement item;
+    if (!UpdateFromDict(item_values, kOffsetKey, &item.offset) ||
+        !UpdateFromDict(item_values, kPositionKey, &item.position) ||
         !UpdateFromDict(item_values, kDisplayPlacementDisplayIdKey,
-                        &item->display_id) ||
+                        &item.display_id) ||
         !UpdateFromDict(item_values, kDisplayPlacementParentDisplayIdKey,
-                        &item->parent_display_id)) {
+                        &item.parent_display_id)) {
       return false;
     }
 
-    output->push_back(std::move(item));
+    output->push_back(item);
   }
   return true;
 }
 
 }  // namespace
 
 bool JsonToDisplayLayout(const base::Value& value, DisplayLayout* layout) {
   layout->placement_list.clear();
   const base::DictionaryValue* dict_value = nullptr;
   if (!value.GetAsDictionary(&dict_value))
@@ skipping 18 matching lines @@
 bool DisplayLayoutToJson(const DisplayLayout& layout, base::Value* value) {
   base::DictionaryValue* dict_value = nullptr;
   if (!value->GetAsDictionary(&dict_value))
     return false;
 
   dict_value->SetBoolean(kMirroredKey, layout.mirrored);
   dict_value->SetBoolean(kDefaultUnifiedKey, layout.default_unified);
   dict_value->SetString(kPrimaryIdKey, base::Int64ToString(layout.primary_id));
 
   scoped_ptr<base::ListValue> placement_list(new base::ListValue);
-  for (const auto* placement : layout.placement_list) {
+  for (const auto& placement : layout.placement_list) {
     scoped_ptr<base::DictionaryValue> placement_value(
         new base::DictionaryValue);
     placement_value->SetString(
-        kPositionKey, DisplayPlacement::PositionToString(placement->position));
-    placement_value->SetInteger(kOffsetKey, placement->offset);
+        kPositionKey, DisplayPlacement::PositionToString(placement.position));
+    placement_value->SetInteger(kOffsetKey, placement.offset);
     placement_value->SetString(kDisplayPlacementDisplayIdKey,
-                               base::Int64ToString(placement->display_id));
+                               base::Int64ToString(placement.display_id));
     placement_value->SetString(
         kDisplayPlacementParentDisplayIdKey,
-        base::Int64ToString(placement->parent_display_id));
+        base::Int64ToString(placement.parent_display_id));
     placement_list->Append(std::move(placement_value));
   }
   dict_value->Set(kDisplayPlacementKey, std::move(placement_list));
   return true;
 }
 
 }  // namespace ash