Revert 170550 - Revert 170477 - Removes the |event| parameter from ActivationDelegate::ShouldActiva…

ash/test/test_activation_delegate.h

Index: ash/test/test_activation_delegate.h
===================================================================
--- ash/test/test_activation_delegate.h	(revision 170570)
+++ ash/test/test_activation_delegate.h	(working copy)
@@ -37,7 +37,7 @@
   }
 
   // Overridden from client::ActivationDelegate:
-  virtual bool ShouldActivate(const ui::Event* event) OVERRIDE;
+  virtual bool ShouldActivate() const OVERRIDE;
   virtual void OnActivated() OVERRIDE;
   virtual void OnLostActive() OVERRIDE;
 
@@ -47,7 +47,7 @@
   bool activate_;
   int activated_count_;
   int lost_active_count_;
-  int should_activate_count_;
+  mutable int should_activate_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
 };