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

chrome/browser/extensions/display_info_provider_chromeos.cc

 // Copyright 2014 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/extensions/display_info_provider_chromeos.h"
 
 #include <stdint.h>
 
 #include "ash/display/display_configuration_controller.h"
 #include "ash/display/display_manager.h"
@@ skipping 79 matching lines @@
 // | REFERENCE           |
 // |                     |
 // |                     |
 // +---------------------+
 //                 +-------------------------------------------------+
 //                 | RECTANGLE               x                       |
 //                 +-------------------------------------------------+
 //
 // The rectangle shares an egde with the reference's bottom edge, but it's
 // center point is in the left area.
-scoped_ptr<ash::DisplayPlacement> CreatePlacementForRectangles(
+ash::DisplayPlacement CreatePlacementForRectangles(
     const gfx::Rect& reference,
     const gfx::Rect& rectangle) {
   // Translate coordinate system so origin is in the reference's top left point
   // (so the reference's down-diagonal vector starts in the (0, 0)) and scale it
   // up by two (to avoid division when calculating the rectangle's center
   // point).
   gfx::Point center(2 * (rectangle.x() - reference.x()) + rectangle.width(),
                     2 * (rectangle.y() - reference.y()) + rectangle.height());
   gfx::Point down_diag(2 * reference.width(), 2 * reference.height());
 
@@ skipping 35 matching lines @@
       position = ash::DisplayPlacement::RIGHT;
     } else if (rectangle.x() + rectangle.width() < reference.x()) {
       // The rectangle is over or under, but completely left of the reference.
       position = ash::DisplayPlacement::LEFT;
     }
   }
   int offset = (position == ash::DisplayPlacement::LEFT ||
                 position == ash::DisplayPlacement::RIGHT)
                    ? rectangle.y()
                    : rectangle.x();
-  return make_scoped_ptr(new ash::DisplayPlacement(position, offset));
+  return ash::DisplayPlacement(position, offset);
 }
 
 // Updates the display layout for the target display in reference to the primary
 // display.
 void UpdateDisplayLayout(const gfx::Rect& primary_display_bounds,
                          int64_t primary_display_id,
                          const gfx::Rect& target_display_bounds,
                          int64_t target_display_id) {
-  scoped_ptr<ash::DisplayPlacement> placement(CreatePlacementForRectangles(
+  ash::DisplayPlacement placement(CreatePlacementForRectangles(
       primary_display_bounds, target_display_bounds));
-  placement->display_id = target_display_id;
-  placement->parent_display_id = primary_display_id;
+  placement.display_id = target_display_id;
+  placement.parent_display_id = primary_display_id;
 
   scoped_ptr<ash::DisplayLayout> layout(new ash::DisplayLayout);
-  layout->placement_list.push_back(std::move(placement));
+  layout->placement_list.push_back(placement);
   layout->primary_id = primary_display_id;
 
   ash::Shell::GetInstance()
       ->display_configuration_controller()
       ->SetDisplayLayout(std::move(layout), false /* user_action */);
 }
 
 // Validates that parameters passed to the SetInfo function are valid for the
 // desired display and the current display manager state.
 // Returns whether the parameters are valid. On failure |error| is set to the
@@ skipping 233 matching lines @@
   }
   return all_displays;
 }
 
 // static
 DisplayInfoProvider* DisplayInfoProvider::Create() {
   return new DisplayInfoProviderChromeOS();
 }
 
 }  // namespace extensions