views: Remove a few usages of the deprecated ScopedVector.

BUG=554289

Review URL: https://codereview.chromium.org/1455333002

Cr-Commit-Position: refs/heads/master@{#360633}

ui/views/controls/label.h

@@ -7,7 +7,6 @@
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "base/memory/scoped_vector.h"
 #include "ui/gfx/render_text.h"
 #include "ui/views/view.h"
 
@@ -187,7 +186,7 @@ class VIEWS_EXPORT Label : public View {
   scoped_ptr<gfx::RenderText> render_text_;
 
   // The RenderText instances used to display elided and multi-line text.
-  ScopedVector<gfx::RenderText> lines_;
+  std::vector<scoped_ptr<gfx::RenderText>> lines_;
 
   SkColor requested_enabled_color_;
   SkColor actual_enabled_color_;

ui/views/examples/label_example.cc

@@ -209,7 +209,7 @@ Combobox* LabelExample::AddCombobox(GridLayout* layout,
   layout->StartRow(0, 0);
   layout->AddView(new Label(base::ASCIIToUTF16(name)));
   ExampleComboboxModel* model = new ExampleComboboxModel(strings, count);
-  example_combobox_models_.push_back(model);
+  example_combobox_models_.push_back(make_scoped_ptr(model));
   Combobox* combobox = new Combobox(model);
   combobox->SetSelectedIndex(0);
   combobox->set_listener(this);

ui/views/examples/label_example.h

@@ -55,7 +55,7 @@ class VIEWS_EXAMPLES_EXPORT LabelExample : public ExampleBase,
   Textfield* textfield_;
   Combobox* alignment_;
   Combobox* elide_behavior_;
-  ScopedVector<ExampleComboboxModel> example_combobox_models_;
+  std::vector<scoped_ptr<ExampleComboboxModel>> example_combobox_models_;
   Checkbox* multiline_;
   Checkbox* shadows_;
   Label* custom_label_;