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

Unified Diff: ui/views/controls/menu/menu_runner_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
Index: ui/views/controls/menu/menu_runner_unittest.cc
diff --git a/ui/views/controls/menu/menu_runner_unittest.cc b/ui/views/controls/menu/menu_runner_unittest.cc
index 49ba8832a1e11a5b860cf8146ce357128a98c69a..afbdba75e8c17c8be8042dd1f4b5cd63bade18cf 100644
--- a/ui/views/controls/menu/menu_runner_unittest.cc
+++ b/ui/views/controls/menu/menu_runner_unittest.cc
@@ -6,8 +6,9 @@
#include <stdint.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/base/ui_base_types.h"
#include "ui/events/test/event_generator.h"
@@ -95,9 +96,9 @@ class MenuRunnerTest : public ViewsTestBase {
// Owned by MenuRunner.
MenuItemView* menu_item_view_;
- scoped_ptr<TestMenuDelegate> menu_delegate_;
- scoped_ptr<MenuRunner> menu_runner_;
- scoped_ptr<Widget> owner_;
+ std::unique_ptr<TestMenuDelegate> menu_delegate_;
+ std::unique_ptr<MenuRunner> menu_runner_;
+ std::unique_ptr<Widget> owner_;
DISALLOW_COPY_AND_ASSIGN(MenuRunnerTest);
};
@@ -220,9 +221,9 @@ TEST_F(MenuRunnerTest, NestingDuringDrag) {
EXPECT_EQ(MenuRunner::NORMAL_EXIT, result);
EXPECT_TRUE(runner->IsRunning());
- scoped_ptr<TestMenuDelegate> nested_delegate(new TestMenuDelegate);
+ std::unique_ptr<TestMenuDelegate> nested_delegate(new TestMenuDelegate);
MenuItemView* nested_menu = new MenuItemView(nested_delegate.get());
- scoped_ptr<MenuRunner> nested_runner(
+ std::unique_ptr<MenuRunner> nested_runner(
new MenuRunner(nested_menu, MenuRunner::IS_NESTED | MenuRunner::ASYNC));
result = nested_runner->RunMenuAt(owner(), nullptr, gfx::Rect(),
MENU_ANCHOR_TOPLEFT, ui::MENU_SOURCE_NONE);
« no previous file with comments | « ui/views/controls/menu/menu_runner_impl_adapter.h ('k') | ui/views/controls/menu/menu_scroll_view_container.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698