Remove old activation code and disable-focus-controller flags

ash/wm/window_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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_activation_delegate.h"
-#include "ash/wm/activation_controller.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_event_handler.h"
@@ skipping 291 matching lines @@
     EXPECT_EQ(0, d2.activated_count());
     EXPECT_EQ(0, d2.lost_active_count());
     d1.Clear();
     d2.Clear();
   }
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
-  EXPECT_EQ(views::corewm::UseFocusController() ? 1 : 0,
-            d2.lost_active_count());
+  EXPECT_EQ(1, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 
   // Clicking an active window with a child shouldn't steal the
   // focus from the child.
   {
     scoped_ptr<aura::Window> w11(CreateTestWindowWithDelegate(
           &wd, -11, gfx::Rect(10, 10, 10, 10), w1.get()));
@@ skipping 132 matching lines @@
   EXPECT_EQ(0, d1.lost_active_count());
   EXPECT_EQ(0, d2.activated_count());
   EXPECT_EQ(0, d2.lost_active_count());
   d1.Clear();
   d2.Clear();
 
   // Destroy window2, this should make window1 active.
   d1.set_activate(true);
   w2.reset();
   EXPECT_EQ(0, d2.activated_count());
-  EXPECT_EQ(views::corewm::UseFocusController() ? 1 : 0,
-            d2.lost_active_count());
+  EXPECT_EQ(1, d2.lost_active_count());
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
   EXPECT_EQ(w1.get(), focus_client->GetFocusedWindow());
   EXPECT_EQ(1, d1.activated_count());
   EXPECT_EQ(0, d1.lost_active_count());
 }
 
 TEST_F(WindowManagerTest, MouseEventCursors) {
   aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
 
   // Create a window.
@@ skipping 343 matching lines @@
   // Mouse move should show the cursor.
   observer_a.reset();
   observer_b.reset();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 
 }  // namespace ash