Index: ash/shelf/shelf_layout_manager_unittest.cc |
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc |
index 8ee70eccd3ffbeed02a43d5b489d9f83e4393efc..6a61e9985e24c01404e1734e220fef88d671e536 100644 |
--- a/ash/shelf/shelf_layout_manager_unittest.cc |
+++ b/ash/shelf/shelf_layout_manager_unittest.cc |
@@ -1513,13 +1513,14 @@ TEST_F(ShelfLayoutManagerTest, GestureEdgeSwipe) { |
shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); |
shelf->LayoutShelf(); |
+ EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state()); |
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state()); |
aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow()); |
generator.GestureEdgeSwipe(); |
- EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state()); |
- EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state()); |
widget->SetFullscreen(true); |
wm::GetWindowState(window)->set_hide_shelf_when_fullscreen(false); |
@@ -1527,12 +1528,13 @@ TEST_F(ShelfLayoutManagerTest, GestureEdgeSwipe) { |
gfx::Rect bounds_fullscreen = window->bounds(); |
EXPECT_TRUE(widget->IsFullscreen()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state()); |
EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state()); |
generator.GestureEdgeSwipe(); |
- EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state()); |
- EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_NEVER, shelf->auto_hide_behavior()); |
- EXPECT_FALSE(widget->IsFullscreen()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state()); |
+ EXPECT_EQ(SHELF_AUTO_HIDE_SHOWN, shelf->auto_hide_state()); |
+ EXPECT_TRUE(widget->IsFullscreen()); |
} |
#if defined(OS_WIN) |