Remove old activation code and disable-focus-controller flags

ash/shelf/shelf_widget_unittest.cc

Index: ash/shelf/shelf_widget_unittest.cc
diff --git a/ash/shelf/shelf_widget_unittest.cc b/ash/shelf/shelf_widget_unittest.cc
index f043f342fe6646fa540643d70023e9af887f19d6..50f635b1c305458ee064e2b18c9176cdddb4f39d 100644
--- a/ash/shelf/shelf_widget_unittest.cc
+++ b/ash/shelf/shelf_widget_unittest.cc
@@ -39,11 +39,9 @@ typedef test::AshTestBase ShelfWidgetTest;
 
 // Launcher can't be activated on mouse click, but it is activable from
 // the focus cycler or as fallback.
-TEST_F(ShelfWidgetTest, ActivateAsFallback) {
-  // TODO(mtomasz): make this test work with the FocusController.
-  if (views::corewm::UseFocusController())
-    return;
-
+// TODO(mtomasz): make this test work with the FocusController.
+// crbug.com/285364.

[James Cook, 2013/09/04 22:53:50]

Thanks for filing a bug for this!

+TEST_F(ShelfWidgetTest, DISABLED_ActivateAsFallback) {
   Launcher* launcher = Launcher::ForPrimaryDisplay();
   ShelfWidget* shelf_widget = launcher->shelf_widget();
   EXPECT_FALSE(shelf_widget->CanActivate());