aura: A couple of API cleanups.

ash/first_run/first_run_helper_unittest.cc

 // Copyright 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/first_run/first_run_helper.h"
 
 #include "ash/first_run/desktop_cleaner.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 119 matching lines @@
 // Tests that modal window doesn't block events for overlay window.
 TEST_F(FirstRunHelperTest, ModalWindowDoesNotBlock) {
   views::Widget* modal_dialog = views::DialogDelegate::CreateDialogWidget(
       new TestModalDialogDelegate(), CurrentContext(), NULL);
   modal_dialog->Show();
   // TODO(dzhioev): modal window should not steal focus from overlay window.
   aura::Window* overlay_window = helper()->GetOverlayWidget()->GetNativeView();
   overlay_window->Focus();
   EXPECT_TRUE(overlay_window->HasFocus());
   int mouse_events;
-  overlay_window->SetEventFilter(new CountingEventHandler(&mouse_events));
+  CountingEventHandler handler(&mouse_events);
+  overlay_window->AddPreTargetHandler(&handler);
   GetEventGenerator().PressLeftButton();
   GetEventGenerator().ReleaseLeftButton();
   EXPECT_EQ(mouse_events, 2);
+  overlay_window->RemovePreTargetHandler(&handler);
 }
 
 }  // namespace test
 }  // namespace ash