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

chrome/browser/ui/ash/launcher/browser_launcher_item_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 "chrome/browser/ui/ash/launcher/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_model.h"
@@ skipping 141 matching lines @@
     }
 
     ash::LauncherItem GetUpdaterItem() {
       ash::LauncherID launcher_id =
           BrowserLauncherItemController::TestApi(&updater).item_id();
       int index = launcher_test->launcher_model_->ItemIndexByID(launcher_id);
       return launcher_test->launcher_model_->items()[index];
     }
 
     // aura::client::ActivationDelegate overrides.
-    virtual bool ShouldActivate() const OVERRIDE {
+    virtual bool ShouldActivate(const ui::Event* event) OVERRIDE {
       return true;
     }
     virtual void OnActivated() OVERRIDE {
       updater.BrowserActivationStateChanged();
     }
     virtual void OnLostActive() OVERRIDE {
       updater.BrowserActivationStateChanged();
     }
 
     BrowserLauncherItemControllerTest* launcher_test;
@@ skipping 245 matching lines @@
   EXPECT_EQ(ash::STATUS_RUNNING, app_state.GetUpdaterItem().status);
 
   // App window should go to attention state.
   app_state.window.SetProperty(aura::client::kDrawAttentionKey, true);
   EXPECT_EQ(ash::STATUS_ATTENTION, app_state.GetUpdaterItem().status);
 
   // Activating app window should clear attention state.
   activation_client_->ActivateWindow(&app_state.window);
   EXPECT_EQ(ash::STATUS_ACTIVE, app_state.GetUpdaterItem().status);
 }