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

ash/test/test_activation_delegate.h

 // 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.
 
 #ifndef ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
 #define ASH_TEST_TEST_ACTIVATION_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "ui/aura/client/activation_delegate.h"
@@ skipping 19 matching lines @@
   void set_activate(bool v) { activate_ = v; }
   int activated_count() const { return activated_count_; }
   int lost_active_count() const { return lost_active_count_; }
   int should_activate_count() const { return should_activate_count_; }
   void Clear() {
     activated_count_ = lost_active_count_ = should_activate_count_ = 0;
     window_was_active_ = false;
   }
 
   // Overridden from client::ActivationDelegate:
-  virtual bool ShouldActivate() const OVERRIDE;
+  virtual bool ShouldActivate(const ui::Event* event) OVERRIDE;
   virtual void OnActivated() OVERRIDE;
   virtual void OnLostActive() OVERRIDE;
 
  private:
   aura::Window* window_;
   bool window_was_active_;
   bool activate_;
   int activated_count_;
   int lost_active_count_;
-  mutable int should_activate_count_;
+  int should_activate_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestActivationDelegate);
 };
 
 }  // namespace test
 }  // namespace ash
 
 #endif  // ASH_TEST_TEST_ACTIVATION_DELEGATE_H_