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

ash/display/display_layout_store.cc

 // Copyright 2013 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 <stdio.h>
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
@@ skipping 40 matching lines @@
     const DisplayIdList& list,
     scoped_ptr<DisplayLayout> layout) {
 
   // Do not overwrite the valid data with old invalid date.
   if (layouts_.count(list) && !CompareDisplayIds(list[0], list[1]))
     return;
 
   // Old data may not have the display_id/parent_display_id.
   // Guess these values based on the saved primary_id.
   if (layout->placement_list.size() >= 1 &&
-      layout->placement_list[0]->display_id ==
-          gfx::Display::kInvalidDisplayID) {
+      layout->placement_list[0].display_id == gfx::Display::kInvalidDisplayID) {
     if (layout->primary_id == list[1]) {
-      layout->placement_list[0]->display_id = list[0];
-      layout->placement_list[0]->parent_display_id = list[1];
+      layout->placement_list[0].display_id = list[0];
+      layout->placement_list[0].parent_display_id = list[1];
     } else {
-      layout->placement_list[0]->display_id = list[1];
-      layout->placement_list[0]->parent_display_id = list[0];
+      layout->placement_list[0].display_id = list[1];
+      layout->placement_list[0].parent_display_id = list[0];
     }
   }
   DCHECK(DisplayLayout::Validate(list, *layout.get())) << layout->ToString();
   layouts_[list] = std::move(layout);
 }
 
 const DisplayLayout& DisplayLayoutStore::GetRegisteredDisplayLayout(
     const DisplayIdList& list) {
   DCHECK_NE(1u, list.size());
   const auto iter = layouts_.find(list);
@@ skipping 16 matching lines @@
   layouts_[list]->default_unified = default_unified;
 }
 
 DisplayLayout* DisplayLayoutStore::CreateDefaultDisplayLayout(
     const DisplayIdList& list) {
   scoped_ptr<DisplayLayout> layout(new DisplayLayout);
   // The first display is the primary by default.
   layout->primary_id = list[0];
   layout->placement_list.clear();
   for (size_t i = 0; i < list.size() - 1; i++) {
-    scoped_ptr<DisplayPlacement> placement(
-        new DisplayPlacement(default_display_placement_));
-    placement->display_id = list[i + 1];
-    placement->parent_display_id = list[i];
-    layout->placement_list.push_back(std::move(placement));
+    DisplayPlacement placement(default_display_placement_);
+    placement.display_id = list[i + 1];
+    placement.parent_display_id = list[i];
+    layout->placement_list.push_back(placement);
   }
   layouts_[list] = std::move(layout);
   auto iter = layouts_.find(list);
   return iter->second.get();
 }
 
 }  // namespace ash