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

Unified Diff: ash/drag_drop/drag_image_view_unittest.cc

Issue 2828543003: chromeos: converts DragImageViewTest to AshTestBase (Closed)
Patch Set: cleanup Created 3 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: ash/drag_drop/drag_image_view_unittest.cc
diff --git a/ash/drag_drop/drag_image_view_unittest.cc b/ash/drag_drop/drag_image_view_unittest.cc
index 6fa0bd3cbdfb4730e71a130f074f6000b7e4bb92..44911a78970554ebe81da0fb5f9ed53a7573ef66 100644
--- a/ash/drag_drop/drag_image_view_unittest.cc
+++ b/ash/drag_drop/drag_image_view_unittest.cc
@@ -4,18 +4,19 @@
#include "ash/drag_drop/drag_image_view.h"
-#include "ash/test/ash_test.h"
+#include "ash/test/ash_test_base.h"
+#include "ui/aura/window.h"
#include "ui/base/dragdrop/drag_drop_types.h"
namespace ash {
namespace test {
-using DragDropImageTest = AshTest;
+using DragDropImageTest = AshTestBase;
TEST_F(DragDropImageTest, SetBoundsConsidersDragHintForTouch) {
- std::unique_ptr<WindowOwner> window_owner(CreateTestWindow());
+ std::unique_ptr<aura::Window> window(CreateTestWindow());
DragImageView drag_image_view(
- window_owner->window(),
+ window.get(),
ui::DragDropTypes::DragEventSource::DRAG_EVENT_SOURCE_TOUCH);
gfx::Size minimum_size = drag_image_view.GetMinimumSize();
@@ -45,9 +46,9 @@ TEST_F(DragDropImageTest, SetBoundsConsidersDragHintForTouch) {
}
TEST_F(DragDropImageTest, SetBoundsIgnoresDragHintForMouse) {
- std::unique_ptr<WindowOwner> window_owner(CreateTestWindow());
+ std::unique_ptr<aura::Window> window(CreateTestWindow());
DragImageView drag_image_view(
- window_owner->window(),
+ window.get(),
ui::DragDropTypes::DragEventSource::DRAG_EVENT_SOURCE_MOUSE);
// Expect no drag hint image.

Powered by Google App Engine
This is Rietveld 408576698