[Cleanup] consolidate DISABLED macros in mouse_cursor_event_filter_unittests.cc

ash/wm/activation_controller_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/wm/activation_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
@@ skipping 190 matching lines @@
   aura::test::TestWindowDelegate wd;
   TestActivationDelegate ad1;
   TestActivationDelegate ad2(false);
 
   scoped_ptr<aura::Window> w1(CreateTestWindowInShellWithDelegate(
       &wd, 1, gfx::Rect(100, 100)));
   ad1.SetWindow(w1.get());
   EXPECT_EQ(NULL, wm::GetActiveWindow());
 
   // Clicking on an activatable window activates the window.
-  aura::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), w1.get());
+  aura::test::EventGenerator& generator = GetEventGenerator();
+  generator.MoveMouseToCenterOf(w1.get());
   generator.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(w1.get()));
 
   // Creates a menu that covers the transient parent.
   scoped_ptr<aura::Window> menu(CreateTestWindowInShellWithDelegateAndType(
       &wd, aura::client::WINDOW_TYPE_MENU, 2, gfx::Rect(100, 100)));
   ad2.SetWindow(menu.get());
   w1->AddTransientChild(menu.get());
 
   // Clicking on a menu whose transient parent is active window shouldn't
@@ skipping 340 matching lines @@
   EXPECT_EQ(w2_d1.get(), client->GetActiveWindow());
 
   client->ActivateWindow(w3_d2.get());
   EXPECT_EQ(w3_d2.get(), client->GetActiveWindow());
   w3_d2.reset();
   EXPECT_EQ(w4_d2.get(), client->GetActiveWindow());
 }
 
 }  // namespace test
 }  // namespace ash