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

Unified Diff: ui/views/bubble/bubble_frame_view_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/bubble/bubble_frame_view.cc ('k') | ui/views/bubble/bubble_window_targeter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/bubble/bubble_frame_view_unittest.cc
diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
index d71137f5eb2513260e9a4e037945dd1a44c78697..9f489f525d202fa74fda0a72710b107d70ada015 100644
--- a/ui/views/bubble/bubble_frame_view_unittest.cc
+++ b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -2,14 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/bubble/bubble_frame_view.h"
+
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "ui/gfx/geometry/insets.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/bubble/bubble_border.h"
-#include "ui/views/bubble/bubble_frame_view.h"
#include "ui/views/test/test_views.h"
#include "ui/views/test/views_test_base.h"
#include "ui/views/widget/widget.h"
@@ -70,7 +72,7 @@ class TestBubbleFrameView : public BubbleFrameView {
: BubbleFrameView(gfx::Insets(), gfx::Insets(kMargin)),
test_base_(test_base),
available_bounds_(gfx::Rect(0, 0, 1000, 1000)) {
- SetBubbleBorder(scoped_ptr<BubbleBorder>(
+ SetBubbleBorder(std::unique_ptr<BubbleBorder>(
new BubbleBorder(kArrow, BubbleBorder::NO_SHADOW, kColor)));
}
~TestBubbleFrameView() override {}
@@ -102,8 +104,8 @@ class TestBubbleFrameView : public BubbleFrameView {
gfx::Rect available_bounds_;
// Widget returned by GetWidget(). Only created if GetWidget() is called.
- mutable scoped_ptr<TestBubbleFrameViewWidgetDelegate> widget_delegate_;
- mutable scoped_ptr<Widget> widget_;
+ mutable std::unique_ptr<TestBubbleFrameViewWidgetDelegate> widget_delegate_;
+ mutable std::unique_ptr<Widget> widget_;
DISALLOW_COPY_AND_ASSIGN(TestBubbleFrameView);
};
« no previous file with comments | « ui/views/bubble/bubble_frame_view.cc ('k') | ui/views/bubble/bubble_window_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698