Remove old activation code and disable-focus-controller flags

ash/shelf/shelf_widget_unittest.cc

 // Copyright (c) 2013 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_widget.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
@@ skipping 21 matching lines @@
 internal::ShelfLayoutManager* GetShelfLayoutManager() {
   return GetShelfWidget()->shelf_layout_manager();
 }
 
 } // namespace
 
 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());
 
   shelf_widget->WillActivateAsFallback();
   EXPECT_TRUE(shelf_widget->CanActivate());
 
   wm::ActivateWindow(shelf_widget->GetNativeWindow());
   EXPECT_FALSE(shelf_widget->CanActivate());
 }
@@ skipping 129 matching lines @@
   const int status_width =
       shelf->status_area_widget()->GetWindowBoundsInScreen().width();
   EXPECT_GT(status_width, 0);
   EXPECT_EQ(status_width,
             shelf->GetContentsView()->width() -
                 launcher->GetLauncherViewForTest()->width());
 }
 #endif
 
 }  // namespace ash