Replace scoped_ptr with std::unique_ptr in //ui

ui/views/controls/combobox/combobox_unittest.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 "ui/views/controls/combobox/combobox.h"
 
 #include <set>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 233 matching lines @@
         ui::ET_MOUSE_RELEASED, point, point, ui::EventTimeForNow(),
         ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
     widget_->OnMouseEvent(&released_event);
   }
 
   // We need widget to populate wrapper class.
   Widget* widget_;
 
   // |combobox_| will be allocated InitCombobox() and then owned by |widget_|.
   TestCombobox* combobox_;
-  scoped_ptr<ComboboxTestApi> test_api_;
+  std::unique_ptr<ComboboxTestApi> test_api_;
 
   // Combobox does not take ownership of the model, hence it needs to be scoped.
-  scoped_ptr<TestComboboxModel> model_;
+  std::unique_ptr<TestComboboxModel> model_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ComboboxTest);
 };
 
 TEST_F(ComboboxTest, KeyTest) {
   InitCombobox(NULL);
   SendKeyEvent(ui::VKEY_END);
   EXPECT_EQ(combobox_->selected_index() + 1, model_->GetItemCount());
   SendKeyEvent(ui::VKEY_HOME);
@@ skipping 201 matching lines @@
   EXPECT_EQ(0, combobox_->selected_index());
   combobox_->SetSelectedIndex(3);
   EXPECT_EQ(0, combobox_->selected_index());
 }
 
 TEST_F(ComboboxTest, ListenerHandlesDelete) {
   TestComboboxModel model;
 
   // |combobox| will be deleted on change.
   TestCombobox* combobox = new TestCombobox(&model);
-  scoped_ptr<EvilListener> evil_listener(new EvilListener());
+  std::unique_ptr<EvilListener> evil_listener(new EvilListener());
   combobox->set_listener(evil_listener.get());
   ASSERT_NO_FATAL_FAILURE(ComboboxTestApi(combobox).PerformActionAt(2));
   EXPECT_TRUE(evil_listener->deleted());
 
   // With STYLE_ACTION
   // |combobox| will be deleted on change.
   combobox = new TestCombobox(&model);
   evil_listener.reset(new EvilListener());
   combobox->set_listener(evil_listener.get());
   combobox->SetStyle(Combobox::STYLE_ACTION);
@@ skipping 269 matching lines @@
   EXPECT_EQ(ASCIIToUTF16("JELLY"), menu_model->GetLabelAt(1));
 
   // Check that with STYLE_ACTION, the first item (only) is not shown.
   EXPECT_TRUE(menu_model->IsVisibleAt(0));
   combobox_->SetStyle(Combobox::STYLE_ACTION);
   EXPECT_FALSE(menu_model->IsVisibleAt(0));
   EXPECT_TRUE(menu_model->IsVisibleAt(1));
 }
 
 }  // namespace views