Replace scoped_ptr with std::unique_ptr in //ui

ui/message_center/views/notifier_settings_view.cc

 // 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.
 
 #include "ui/message_center/views/notifier_settings_view.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 101 matching lines @@
 // space included in the title label.
 const int kComputedTitleTopMargin =
     settings::kTopMargin - kInnateTitleTopMargin;
 
 // The switcher has a lot of blank space built in so we should include that when
 // spacing the title area vertically.
 const int kComputedTitleElementSpacing =
     settings::kDescriptionToSwitcherSpace - 6;
 
 // A function to create a focus border.
-scoped_ptr<views::Painter> CreateFocusPainter() {
+std::unique_ptr<views::Painter> CreateFocusPainter() {
   return views::Painter::CreateSolidFocusPainter(kFocusBorderColor,
                                                  gfx::Insets(1, 2, 3, 2));
 }
 
 // EntryView ------------------------------------------------------------------
 
 // The view to guarantee the 48px height and place the contents at the
 // middle. It also guarantee the left margin.
 class EntryView : public views::View {
  public:
   explicit EntryView(views::View* contents);
   ~EntryView() override;
 
   // views::View:
   void Layout() override;
   gfx::Size GetPreferredSize() const override;
   void GetAccessibleState(ui::AXViewState* state) override;
   void OnFocus() override;
   bool OnKeyPressed(const ui::KeyEvent& event) override;
   bool OnKeyReleased(const ui::KeyEvent& event) override;
   void OnPaint(gfx::Canvas* canvas) override;
   void OnBlur() override;
 
  private:
-  scoped_ptr<views::Painter> focus_painter_;
+  std::unique_ptr<views::Painter> focus_painter_;
 
   DISALLOW_COPY_AND_ASSIGN(EntryView);
 };
 
 EntryView::EntryView(views::View* contents)
     : focus_painter_(CreateFocusPainter()) {
   AddChildView(contents);
 }
 
 EntryView::~EntryView() {}
@@ skipping 414 matching lines @@
       0,
       settings::kTitleMargin + kMenuButtonInnateMargin));
   contents_title_view->AddChildView(top_label);
 
   if (need_account_switcher) {
     const NotifierGroup& active_group = provider_->GetActiveNotifierGroup();
     base::string16 notifier_group_text = active_group.login_info.empty() ?
         active_group.name : active_group.login_info;
     notifier_group_selector_ =
         new views::MenuButton(notifier_group_text, this, true);
-    notifier_group_selector_->SetBorder(scoped_ptr<views::Border>(
+    notifier_group_selector_->SetBorder(std::unique_ptr<views::Border>(
         new views::LabelButtonAssetBorder(views::Button::STYLE_BUTTON)));
     notifier_group_selector_->SetFocusPainter(nullptr);
     notifier_group_selector_->set_animate_on_state_change(false);
     notifier_group_selector_->SetFocusable(true);
     contents_title_view->AddChildView(notifier_group_selector_);
   }
 
   contents_view->AddChildView(contents_title_view);
 
   size_t notifier_count = notifiers.size();
   for (size_t i = 0; i < notifier_count; ++i) {
     NotifierButton* button = new NotifierButton(provider_, notifiers[i], this);
     EntryView* entry = new EntryView(button);
 
     // This code emulates separators using borders.  We will create an invisible
     // border on the last notifier, as the spec leaves a space for it.
-    scoped_ptr<views::Border> entry_border;
+    std::unique_ptr<views::Border> entry_border;
     if (i == notifier_count - 1) {
       entry_border = views::Border::CreateEmptyBorder(
           0, 0, settings::kEntrySeparatorHeight, 0);
     } else {
       entry_border =
           views::Border::CreateSolidSidedBorder(0,
                                                 0,
                                                 settings::kEntrySeparatorHeight,
                                                 0,
                                                 settings::kEntrySeparatorColor);
@@ skipping 91 matching lines @@
                                              notifier_group_selector_,
                                              menu_anchor,
                                              views::MENU_ANCHOR_BUBBLE_ABOVE,
                                              ui::MENU_SOURCE_MOUSE))
     return;
   MessageCenterView* center_view = static_cast<MessageCenterView*>(parent());
   center_view->OnSettingsChanged();
 }
 
 }  // namespace message_center