Remove --ash-enable-tray-dragging flag

ash/shelf/shelf_layout_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
@@ skipping 344 matching lines @@
 
   // Create a simple widget attached to the current context (will
   // delete on TearDown).
   views::Widget* CreateTestWidget() {
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.bounds = gfx::Rect(0, 0, 200, 200);
     params.context = CurrentContext();
     return CreateTestWidgetWithParams(params);
   }
 
-  // Overridden from AshTestBase:
-  void SetUp() override {
-    base::CommandLine::ForCurrentProcess()->AppendSwitch(
-        ash::switches::kAshEnableTrayDragging);
-    test::AshTestBase::SetUp();
-  }
-
   void RunGestureDragTests(gfx::Vector2d);
 
   // Turn on the lock screen.
   void LockScreen() {
     Shell::GetInstance()->session_state_delegate()->LockScreen();
     // The test session state delegate does not fire the lock state change.
     Shell::GetInstance()->OnLockStateChanged(true);
   }
 
   // Turn off the lock screen.
@@ skipping 1592 matching lines @@
     generator.GestureScrollSequence(start, end,
         base::TimeDelta::FromMilliseconds(10), 1);
     EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
     EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
     ShelfAnimationWaiter waiter2(auto_hidden_bounds);
     waiter2.WaitTillDoneAnimating();
     EXPECT_TRUE(waiter2.WasValidAnimation());
   }
 }
 
-TEST_F(ShelfLayoutManagerTest, GestureRevealsTrayBubble) {
-  if (!SupportsHostWindowResize())
-    return;
-
-  ShelfLayoutManager* shelf = GetShelfLayoutManager();
-  shelf->LayoutShelf();
-
-  // Create a visible window so auto-hide behavior is enforced.
-  CreateTestWidget();
-
-  ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
-  SystemTray* tray = GetSystemTray();
-
-  // First, make sure the shelf is visible.
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
-  EXPECT_FALSE(tray->HasSystemBubble());
-
-  // Now, drag up on the tray to show the bubble.
-  gfx::Point start = GetShelfWidget()->status_area_widget()->
-      GetWindowBoundsInScreen().CenterPoint();
-  gfx::Point end(start.x(), start.y() - 100);
-  generator.GestureScrollSequence(start, end,
-      base::TimeDelta::FromMilliseconds(10), 1);
-  EXPECT_TRUE(tray->HasSystemBubble());
-  tray->CloseSystemBubble();
-  RunAllPendingInMessageLoop();
-  EXPECT_FALSE(tray->HasSystemBubble());
-
-  // Drag again, but only a small amount, and slowly. The bubble should not be
-  // visible.
-  end.set_y(start.y() - 30);
-  generator.GestureScrollSequence(start, end,
-      base::TimeDelta::FromMilliseconds(500), 100);
-  EXPECT_FALSE(tray->HasSystemBubble());
-
-  // Now, hide the shelf.
-  shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
-
-  // Start a drag from the bezel, and drag up to show both the shelf and the
-  // tray bubble.
-  start.set_y(start.y() + 100);
-  end.set_y(start.y() - 400);
-  generator.GestureScrollSequence(start, end,
-      base::TimeDelta::FromMilliseconds(10), 1);
-  EXPECT_EQ(SHELF_VISIBLE, shelf->visibility_state());
-  EXPECT_TRUE(tray->HasSystemBubble());
-}
-
 TEST_F(ShelfLayoutManagerTest, ShelfFlickerOnTrayActivation) {
   ShelfLayoutManager* shelf = GetShelfLayoutManager();
 
   // Create a visible window so auto-hide behavior is enforced.
   CreateTestWidget();
 
   // Turn on auto-hide for the shelf.
   shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
   EXPECT_EQ(SHELF_AUTO_HIDE, shelf->visibility_state());
   EXPECT_EQ(SHELF_AUTO_HIDE_HIDDEN, shelf->auto_hide_state());
@@ skipping 228 matching lines @@
   shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
   gfx::Rect hide_target_bounds =  status_window->GetTargetBounds();
   EXPECT_GT(hide_target_bounds.y(), initial_bounds.y());
 
   shelf_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
   gfx::Rect reshow_target_bounds = status_window->GetTargetBounds();
   EXPECT_EQ(initial_bounds, reshow_target_bounds);
 }
 
 }  // namespace ash