Changing aura::test::EventGenerator to send events through EventSource instead of through EventProc…

ui/aura/test/event_generator.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 "ui/aura/test/event_generator.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event.h"
+#include "ui/events/event_source.h"
 #include "ui/events/event_utils.h"
+#include "ui/events/test/events_test_utils.h"
 #include "ui/gfx/vector2d_conversions.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #include "ui/base/x/x11_util.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
 
 #if defined(OS_WIN)
@@ skipping 575 matching lines @@
       return;
     }
     if (pending_events_.empty()) {
       base::MessageLoopProxy::current()->PostTask(
           FROM_HERE,
           base::Bind(&EventGenerator::DispatchNextPendingEvent,
                      base::Unretained(this)));
     }
     pending_events_.push_back(pending_event);
   } else {
+    ui::EventSource* event_source = current_host_->GetEventSource();
+    ui::EventSourceTestApi event_source_test(event_source);
     ui::EventDispatchDetails details =
-        current_host_->event_processor()->OnEventFromSource(event);
+        event_source_test.SendEventToProcessor(event);
     CHECK(!details.dispatcher_destroyed);
   }
 }
 
 void EventGenerator::DispatchNextPendingEvent() {
   DCHECK(!pending_events_.empty());
   ui::Event* event = pending_events_.front();
   DoDispatchEvent(event, false);
   pending_events_.pop_front();
   delete event;
   if (!pending_events_.empty()) {
     base::MessageLoopProxy::current()->PostTask(
         FROM_HERE,
         base::Bind(&EventGenerator::DispatchNextPendingEvent,
                    base::Unretained(this)));
   }
 }
 
 
 }  // namespace test
 }  // namespace aura