diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-08 10:28:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:40:30 +0000 |
| commit | e733310db58160074f574c429d48f8308c0afe17 (patch) | |
| tree | f8aef4b7e62a69928dbcf880620eece20f98c6df /chromium/ui/views/animation/ink_drop_unittest.cc | |
| parent | 2f583e4aec1ae3a86fa047829c96b310dc12ecdf (diff) | |
| download | qtwebengine-chromium-e733310db58160074f574c429d48f8308c0afe17.tar.gz | |
BASELINE: Update Chromium to 56.0.2924.122
Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui/views/animation/ink_drop_unittest.cc')
| -rw-r--r-- | chromium/ui/views/animation/ink_drop_unittest.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chromium/ui/views/animation/ink_drop_unittest.cc b/chromium/ui/views/animation/ink_drop_unittest.cc index 43a77fe0b05..4cee71e8dd7 100644 --- a/chromium/ui/views/animation/ink_drop_unittest.cc +++ b/chromium/ui/views/animation/ink_drop_unittest.cc @@ -52,12 +52,12 @@ InkDropTest::InkDropTest() : ink_drop_(nullptr) { zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( ui::ScopedAnimationDurationScaleMode::ZERO_DURATION)); - switch (InkDropType()) { + switch (GetInkDropType()) { case INK_DROP_STUB: ink_drop_.reset(new InkDropStub()); break; case INK_DROP_IMPL: - ink_drop_.reset(new InkDropImpl(&test_ink_drop_host_)); + ink_drop_.reset(new InkDropImpl(&test_ink_drop_host_, gfx::Size())); // The Timer's used by the InkDropImpl class require a // base::ThreadTaskRunnerHandle instance. scoped_refptr<base::TestMockTimeTaskRunner> task_runner( @@ -87,14 +87,6 @@ TEST_P(InkDropTest, EXPECT_EQ(0, test_ink_drop_host_.num_ink_drop_layers()); } -TEST_P(InkDropTest, - VerifyInkDropLayersRemovedAfterDestructionWhenHoverIsActive) { - test_ink_drop_host_.set_should_show_highlight(true); - ink_drop_->SetHovered(true); - ink_drop_.reset(); - EXPECT_EQ(0, test_ink_drop_host_.num_ink_drop_layers()); -} - TEST_P(InkDropTest, StateIsHiddenInitially) { EXPECT_EQ(InkDropState::HIDDEN, ink_drop_->GetTargetInkDropState()); } |