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

ash/display/display_layout_builder.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/display_layout_builder.h"
 
+#include <algorithm>
+
 namespace ash {
 
 DisplayLayoutBuilder::DisplayLayoutBuilder(const DisplayLayout& layout)
     : layout_(layout.Copy()) {}
 
 DisplayLayoutBuilder::DisplayLayoutBuilder(int64_t primary_id)
     : layout_(new DisplayLayout) {
   layout_->primary_id = primary_id;
 }
 
@@ skipping 13 matching lines @@
 DisplayLayoutBuilder& DisplayLayoutBuilder::ClearPlacements() {
   layout_->placement_list.clear();
   return *this;
 }
 
 DisplayLayoutBuilder& DisplayLayoutBuilder::AddDisplayPlacement(
     int64_t display_id,
     int64_t parent_display_id,
     DisplayPlacement::Position position,
     int offset) {
-  scoped_ptr<DisplayPlacement> placement(new DisplayPlacement);
-  placement->position = position;
-  placement->offset = offset;
-  placement->display_id = display_id;
-  placement->parent_display_id = parent_display_id;
-  layout_->placement_list.push_back(std::move(placement));
+  DisplayPlacement placement;
+  placement.position = position;
+  placement.offset = offset;
+  placement.display_id = display_id;
+  placement.parent_display_id = parent_display_id;
+  layout_->placement_list.push_back(placement);
   return *this;
 }
 
 DisplayLayoutBuilder& DisplayLayoutBuilder::SetSecondaryPlacement(
     int64_t secondary_id,
     DisplayPlacement::Position position,
     int offset) {
   layout_->placement_list.clear();
   AddDisplayPlacement(secondary_id, layout_->primary_id, position, offset);
   return *this;
 }
 
 scoped_ptr<DisplayLayout> DisplayLayoutBuilder::Build() {
   std::sort(layout_->placement_list.begin(), layout_->placement_list.end(),
-            [](const DisplayPlacement* a, const DisplayPlacement* b) {
-              return a->display_id < b->display_id;
+            [](const DisplayPlacement& a, const DisplayPlacement& b) {
+              return a.display_id < b.display_id;
             });
   return std::move(layout_);
 }
 
 }  // namespace ash