Cleanups for aura/test/event_generator.h (resolve TODOs)

ash/ime/candidate_view_unittest.cc

 // Copyright 2014 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/ime/candidate_view.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
+#include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace ime {
 namespace {
 
@@ skipping 29 matching lines @@
       entry.value = base::UTF8ToUTF16(kDummyCandidates[i]);
       candidate->SetEntry(entry);
       container_->AddChildView(candidate);
     }
 
     widget_ = new views::Widget();
     widget_->Init(init_params);
     widget_->Show();
 
     aura::Window* native_window = widget_->GetNativeWindow();
-    event_generator_.reset(new aura::test::EventGenerator(
+    event_generator_.reset(new ui::test::EventGenerator(
         native_window->GetRootWindow(), native_window));
   }
 
   virtual void TearDown() OVERRIDE {
     widget_->Close();
 
     views::ViewsTestBase::TearDown();
   }
 
  protected:
@@ skipping 19 matching lines @@
         last_pressed_ = NULL;
         return i;
       }
     }
 
     DCHECK(last_pressed_ == NULL);
     last_pressed_ = NULL;
     return -1;
   }
 
-  aura::test::EventGenerator* event_generator() {
-    return event_generator_.get();
-  }
+  ui::test::EventGenerator* event_generator() { return event_generator_.get(); }
 
  private:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     last_pressed_ = sender;
   }
 
   views::Widget* widget_;
   views::View* container_;
-  scoped_ptr<aura::test::EventGenerator> event_generator_;
+  scoped_ptr<ui::test::EventGenerator> event_generator_;
   views::View* last_pressed_;
 
   DISALLOW_COPY_AND_ASSIGN(CandidateViewTest);
 };
 
 TEST_F(CandidateViewTest, MouseHovers) {
   GetCandidateAt(0)->SetHighlighted(true);
 
   int highlighted_count = 0;
   EXPECT_EQ(0, GetHighlightedIndex(&highlighted_count));
@@ skipping 53 matching lines @@
       GetCandidateAt(1)->GetBoundsInScreen().CenterPoint());
   EXPECT_EQ(1, GetHighlightedIndex(&highlighted_count));
   EXPECT_EQ(1, highlighted_count);
 
   event_generator()->ReleaseLeftButton();
   EXPECT_EQ(1, GetLastPressedIndexAndReset());
 }
 
 }  // namespace ime
 }  // namespace ash