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

Unified Diff: ui/views/controls/tabbed_pane/tabbed_pane_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/controls/styled_label_unittest.cc ('k') | ui/views/controls/table/table_header.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
index c13e63768281ce2a4386209b21c3ea7d67110824..7152f7eb4f081205e4716b629db38ed46ec291e1 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane_unittest.cc
@@ -2,12 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
+
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/views/controls/tabbed_pane/tabbed_pane.h"
#include "ui/views/test/views_test_base.h"
using base::ASCIIToUTF16;
@@ -35,7 +37,7 @@ typedef ViewsTestBase TabbedPaneTest;
// Tests TabbedPane::GetPreferredSize() and TabbedPane::Layout().
TEST_F(TabbedPaneTest, SizeAndLayout) {
- scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane());
+ std::unique_ptr<TabbedPane> tabbed_pane(new TabbedPane());
View* child1 = new FixedSizeView(gfx::Size(20, 10));
tabbed_pane->AddTab(ASCIIToUTF16("tab1"), child1);
View* child2 = new FixedSizeView(gfx::Size(5, 5));
@@ -67,7 +69,7 @@ TEST_F(TabbedPaneTest, SizeAndLayout) {
}
TEST_F(TabbedPaneTest, AddAndSelect) {
- scoped_ptr<TabbedPane> tabbed_pane(new TabbedPane());
+ std::unique_ptr<TabbedPane> tabbed_pane(new TabbedPane());
// Add several tabs; only the first should be a selected automatically.
for (int i = 0; i < 3; ++i) {
View* tab = new View();
« no previous file with comments | « ui/views/controls/styled_label_unittest.cc ('k') | ui/views/controls/table/table_header.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698