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

Unified Diff: ui/views/widget/native_widget_mac_unittest.mm

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/widget/native_widget_mac_interactive_uitest.mm ('k') | ui/views/widget/root_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/native_widget_mac_unittest.mm
diff --git a/ui/views/widget/native_widget_mac_unittest.mm b/ui/views/widget/native_widget_mac_unittest.mm
index ba095dfbeeb6d2f8a84d72c566efcd4f9cc7dd85..73664e585fc6281807a2b9346d8cac30c1b69203 100644
--- a/ui/views/widget/native_widget_mac_unittest.mm
+++ b/ui/views/widget/native_widget_mac_unittest.mm
@@ -231,7 +231,7 @@ class NativeHostHolder {
private:
base::scoped_nsobject<NSView> view_;
- scoped_ptr<NativeViewHost> host_;
+ std::unique_ptr<NativeViewHost> host_;
DISALLOW_COPY_AND_ASSIGN(NativeHostHolder);
};
@@ -1041,7 +1041,7 @@ TEST_F(NativeWidgetMacTest, NoParentDelegateDuringTeardown) {
// Test the WIDGET_OWNS_NATIVE_WIDGET flow.
{
- scoped_ptr<Widget> parent(new Widget);
+ std::unique_ptr<Widget> parent(new Widget);
Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
params.bounds = gfx::Rect(100, 100, 300, 200);
@@ -1381,7 +1381,7 @@ class NativeWidgetMacViewsOrderTest : public WidgetTest {
const int kNativeViewCount = 3;
for (int i = 0; i < kNativeViewCount; ++i) {
- scoped_ptr<NativeHostHolder> holder(new NativeHostHolder());
+ std::unique_ptr<NativeHostHolder> holder(new NativeHostHolder());
native_host_parent_->AddChildView(holder->host());
holder->AttachNativeView();
hosts_.push_back(std::move(holder));
@@ -1402,7 +1402,7 @@ class NativeWidgetMacViewsOrderTest : public WidgetTest {
Widget* widget_ = nullptr;
View* native_host_parent_ = nullptr;
NSView* compositor_view_ = nil;
- std::vector<scoped_ptr<NativeHostHolder>> hosts_;
+ std::vector<std::unique_ptr<NativeHostHolder>> hosts_;
private:
DISALLOW_COPY_AND_ASSIGN(NativeWidgetMacViewsOrderTest);
« no previous file with comments | « ui/views/widget/native_widget_mac_interactive_uitest.mm ('k') | ui/views/widget/root_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698