Convert Aura to use ui::Event.

chrome/browser/ui/views/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/views/ash/launcher/browser_launcher_item_controller.h"
 
 #include <map>
 #include <string>
 
 #include "ash/launcher/launcher_model.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/test_tab_strip_model_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/activation_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_activation_client.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
+#include "ui/base/event.h"
 
 namespace {
 
 // Test implementation of AppTabHelper
 class AppTabHelperImpl : public ChromeLauncherController::AppTabHelper {
  public:
   AppTabHelperImpl() {}
   virtual ~AppTabHelperImpl() {}
 
   // Sets the id for the specified tab. The id is removed if Remove() is
@@ skipping 107 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 aura::Event* event) 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 236 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);
 }