Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: ui/views/style/mac/dialog_button_border_mac_unittest.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/painter.cc ('k') | ui/views/style/platform_style.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/style/mac/dialog_button_border_mac_unittest.cc
diff --git a/ui/views/style/mac/dialog_button_border_mac_unittest.cc b/ui/views/style/mac/dialog_button_border_mac_unittest.cc
index 471715b7613a8cc1d082fb3a35c940253651e719..a3b7be3582f108eb572fc488e17fe2d9a1e7ab49 100644
--- a/ui/views/style/mac/dialog_button_border_mac_unittest.cc
+++ b/ui/views/style/mac/dialog_button_border_mac_unittest.cc
@@ -5,6 +5,7 @@
#include "ui/views/style/mac/dialog_button_border_mac.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "ui/compositor/canvas_painter.h"
@@ -26,11 +27,11 @@ class TestLabelButton : public LabelButton {
void set_provide_custom_border(bool value) { provide_custom_border_ = value; }
// LabelButton:
- scoped_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
+ std::unique_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
if (!provide_custom_border_)
return LabelButton::CreateDefaultBorder();
- return make_scoped_ptr(new LabelButtonAssetBorder(style()));
+ return base::WrapUnique(new LabelButtonAssetBorder(style()));
}
private:
« no previous file with comments | « ui/views/painter.cc ('k') | ui/views/style/platform_style.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698