gestures: Some more event cleanup.

ui/base/gestures/gesture_recognizer_impl.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/base/gestures/gesture_recognizer_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "ui/base/event.h"
@@ skipping 160 matching lines @@
 
 void GestureRecognizerImpl::TransferEventsTo(GestureConsumer* current_consumer,
                                              GestureConsumer* new_consumer) {
   // Send cancel to all those save |new_consumer| and |current_consumer|.
   // Don't send a cancel to |current_consumer|, unless |new_consumer| is NULL.
   for (TouchIdToConsumerMap::iterator i = touch_id_target_.begin();
        i != touch_id_target_.end(); ++i) {
     if (i->second != new_consumer &&
         (i->second != current_consumer || new_consumer == NULL) &&
         i->second != gesture_consumer_ignorer_.get()) {
-      scoped_ptr<TouchEvent> touch_event(helper_->CreateTouchEvent(
-            ui::ET_TOUCH_CANCELLED, gfx::Point(0, 0),
-            i->first,
-            base::Time::NowFromSystemTime() - base::Time()));
-      helper_->DispatchCancelTouchEvent(touch_event.get());
+      TouchEvent touch_event(ui::ET_TOUCH_CANCELLED, gfx::Point(0, 0),
+            i->first, base::Time::NowFromSystemTime() - base::Time());
+      helper_->DispatchCancelTouchEvent(&touch_event);
       i->second = gesture_consumer_ignorer_.get();
     }
   }
 
   // Transer events from |current_consumer| to |new_consumer|.
   if (current_consumer && new_consumer) {
     TransferTouchIdToConsumerMap(current_consumer, new_consumer,
                                  &touch_id_target_);
     TransferTouchIdToConsumerMap(current_consumer, new_consumer,
                                  &touch_id_target_for_gestures_);
@@ skipping 97 matching lines @@
   RemoveConsumerFromMap(consumer, &touch_id_target_);
   RemoveConsumerFromMap(consumer, &touch_id_target_for_gestures_);
 }
 
 // GestureRecognizer, static
 GestureRecognizer* GestureRecognizer::Create(GestureEventHelper* helper) {
   return new GestureRecognizerImpl(helper);
 }
 
 }  // namespace ui