Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActivate and makes the…

ash/test/test_activation_delegate.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/test/test_activation_delegate.h"
 
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
@@ skipping 20 matching lines @@
       activated_count_(0),
       lost_active_count_(0),
       should_activate_count_(0) {
 }
 
 void TestActivationDelegate::SetWindow(aura::Window* window) {
   window_ = window;
   aura::client::SetActivationDelegate(window, this);
 }
 
-bool TestActivationDelegate::ShouldActivate() const {
+bool TestActivationDelegate::ShouldActivate(const ui::Event* event) {
   should_activate_count_++;
   return activate_;
 }
 
 void TestActivationDelegate::OnActivated() {
   activated_count_++;
 }
 
 void TestActivationDelegate::OnLostActive() {
   if (lost_active_count_++ == 0)
     window_was_active_ = wm::IsActiveWindow(window_);
 }
 
 }  // namespace test
 }  // namespace ash