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

Unified Diff: ash/tooltips/tooltip_controller_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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 | « ash/test/user_metrics_recorder_test_api.h ('k') | ash/touch/touch_hud_debug.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/tooltips/tooltip_controller_unittest.cc
diff --git a/ash/tooltips/tooltip_controller_unittest.cc b/ash/tooltips/tooltip_controller_unittest.cc
index 4bc4cafdde28522141645ec5c55675ab6ca0fa55..1bde140fc76c2d053ff9911f8812572205e2a70d 100644
--- a/ash/tooltips/tooltip_controller_unittest.cc
+++ b/ash/tooltips/tooltip_controller_unittest.cc
@@ -82,7 +82,7 @@ class TooltipControllerTest : public AshTestBase {
}
protected:
- scoped_ptr<TooltipControllerTestHelper> helper_;
+ std::unique_ptr<TooltipControllerTestHelper> helper_;
private:
DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest);
@@ -97,7 +97,7 @@ TEST_F(TooltipControllerTest, NonNullTooltipClient) {
}
TEST_F(TooltipControllerTest, HideTooltipWhenCursorHidden) {
- scoped_ptr<views::Widget> widget(CreateNewWidgetOn(0));
+ std::unique_ptr<views::Widget> widget(CreateNewWidgetOn(0));
TooltipTestView* view = new TooltipTestView;
AddViewToWidgetAndResize(widget.get(), view);
view->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text"));
@@ -132,15 +132,15 @@ TEST_F(TooltipControllerTest, TooltipsOnMultiDisplayShouldNotCrash) {
UpdateDisplay("1000x600,600x400");
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
- scoped_ptr<views::Widget> widget1(CreateNewWidgetWithBoundsOn(
- 0, gfx::Rect(10, 10, 100, 100)));
+ std::unique_ptr<views::Widget> widget1(
+ CreateNewWidgetWithBoundsOn(0, gfx::Rect(10, 10, 100, 100)));
TooltipTestView* view1 = new TooltipTestView;
AddViewToWidgetAndResize(widget1.get(), view1);
view1->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 1"));
EXPECT_EQ(widget1->GetNativeView()->GetRootWindow(), root_windows[0]);
- scoped_ptr<views::Widget> widget2(CreateNewWidgetWithBoundsOn(
- 1, gfx::Rect(1200, 10, 100, 100)));
+ std::unique_ptr<views::Widget> widget2(
+ CreateNewWidgetWithBoundsOn(1, gfx::Rect(1200, 10, 100, 100)));
TooltipTestView* view2 = new TooltipTestView;
AddViewToWidgetAndResize(widget2.get(), view2);
view2->set_tooltip_text(base::ASCIIToUTF16("Tooltip Text for view 2"));
« no previous file with comments | « ash/test/user_metrics_recorder_test_api.h ('k') | ash/touch/touch_hud_debug.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698