Revert of Clean up GestureEventDetails constructors and fix unit tests

athena/home/home_card_gesture_manager_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 "athena/home/home_card_gesture_manager.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/home/public/home_card.h"
 #include "athena/test/athena_test_base.h"
 #include "base/time/time.h"
@@ skipping 28 matching lines @@
     return result;
   }
   int GetProgressCountAndReset() {
     int result = progress_count_;
     progress_count_ = 0;
     return result;
   }
 
   // Process a gesture event for our use case.
   bool ProcessGestureEvent(ui::EventType type, int y) {
-    ui::GestureEventDetails details;
-    if (type == ui::ET_GESTURE_SCROLL_BEGIN ||
-        type == ui::ET_GESTURE_SCROLL_UPDATE)
-      details = ui::GestureEventDetails(type, 0, (y - last_y_));
-    else
-      details = ui::GestureEventDetails(type);
-    ui::GestureEvent event(0, y, ui::EF_NONE, base::TimeDelta(), details);
+    ui::GestureEvent event(0, y, ui::EF_NONE, base::TimeDelta(),
+                           ui::GestureEventDetails(type, 0, (y - last_y_)));
     if (type == ui::ET_GESTURE_SCROLL_BEGIN) {
       // Compute the position that the home card would have wrt to the top of
       // the screen if the screen had screen_bounds().
       HomeCard::State state = HomeCard::Get()->GetState();
       int home_card_top = 0;
       if (state == HomeCard::VISIBLE_BOTTOM)
         home_card_top = screen_bounds().height() - kHomeCardHeight;
       else if (state == HomeCard::VISIBLE_MINIMIZED)
         home_card_top = screen_bounds().height() - kHomeCardMinimizedHeight;
 
@@ skipping 161 matching lines @@
   EXPECT_EQ(0, GetProgressCountAndReset());
 
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 1010);
   ProcessGestureEvent(ui::ET_GESTURE_SCROLL_UPDATE, 800);
   ProcessFlingGesture(-30.0f);
   EXPECT_EQ(1, GetEndCountAndReset());
   EXPECT_EQ(HomeCard::VISIBLE_BOTTOM, final_state_);
 }
 
 }  // namespace athena