Remove ScopedVector from chrome/browser/ui.

chrome/browser/ui/cocoa/autofill/simple_grid_layout.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_AUTOFILL_SIMPLE_GRID_LAYOUT_H_
 #define CHROME_BROWSER_UI_COCOA_AUTOFILL_SIMPLE_GRID_LAYOUT_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include <memory>
+#include <vector>
 
-#include "base/memory/scoped_vector.h"
+#include "base/logging.h"
 
 class Column;
 class ColumnSet;
 class Row;
 class ViewState;
 
 // SimpleGridLayout is a layout manager that positions child views in a grid.
 // Each row has exactly one ColumnSet, ColumnSets can be shared between rows.
 // See ui/views/layout/grid_layout.h for more details - this is a very
 // simplified version of the views class.
@@ skipping 57 matching lines @@
   float GetPreferredHeightForWidth(float with);
 
   int num_rows() const { return static_cast<int>(rows_.size()); }
 
   // These functions are mostly for testing & deviate from Views Layout class.
   int next_column() { return next_column_; }
   void AdvanceColumn() { next_column_++; }
 
  private:
   // Adds a new row, updating associated counters and positions.
-  void AddRow(Row* row);
+  void AddRow(std::unique_ptr<Row> row);
 
   // Next column in the current ColumnSet.
   int next_column_;
 
   int current_auto_id_;  // Starting value for autogenerated columnset ids.
-  ScopedVector<ViewState> view_states_;
-  ScopedVector<ColumnSet> column_sets_;
-  ScopedVector<Row> rows_;
+  std::vector<std::unique_ptr<ViewState>> view_states_;
+  std::vector<std::unique_ptr<ColumnSet>> column_sets_;
+  std::vector<std::unique_ptr<Row>> rows_;
 
   NSView* host_;
 };
 
 // ColumnSet is used to define a set of columns.
 // You don't create a ColumnSet directly, instead use the AddRow method
 // of SimpleGridLayout.
 class ColumnSet {
  public:
   explicit ColumnSet(int id);
   ~ColumnSet();
 
   void AddPaddingColumn(int fixed_width);
   void AddColumn(float resize_percent);
 
   void CalculateSize(float width);
   void ResetColumnXCoordinates();
 
   // ID of this ColumnSet.
   int id() const { return id_; }
 
   int num_columns() const { return static_cast<int>(columns_.size()); }
 
   // Returns the width of the specified columns.
   float GetColumnWidth(int column);
 
   Column* GetColumn(int column_index) {
     DCHECK(column_index >=0 && column_index < num_columns());
-    return columns_[column_index];
+    return columns_[column_index].get();
   }
 
   // These functions are mostly for testing & deviate from Views Layout class.
   float ColumnLocation(int column_index);
 
  private:
   float CalculateRemainingWidth(float width);
   void DistributeRemainingWidth(float width);
 
-  ScopedVector<Column> columns_;
+  std::vector<std::unique_ptr<Column>> columns_;
   int id_;
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_AUTOFILL_SIMPLE_GRID_LAYOUT_H_