Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(285)

Side by Side Diff: content/browser/renderer_host/input/synthetic_gesture_controller_new_unittest.cc

Issue 60573004: Disable SyntheticGestureControllerNewTest.SingleGesture on windows due (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "base/time/time.h" 6 #include "base/time/time.h"
7 #include "content/browser/renderer_host/input/synthetic_gesture_controller_new.h " 7 #include "content/browser/renderer_host/input/synthetic_gesture_controller_new.h "
8 #include "content/browser/renderer_host/input/synthetic_gesture_new.h" 8 #include "content/browser/renderer_host/input/synthetic_gesture_new.h"
9 #include "content/browser/renderer_host/input/synthetic_gesture_target.h" 9 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
10 #include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_ne w.h" 10 #include "content/browser/renderer_host/input/synthetic_smooth_scroll_gesture_ne w.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 base::MessageLoop::current()->Run(); 179 base::MessageLoop::current()->Run();
180 } 180 }
181 181
182 base::MessageLoopForUI message_loop_; 182 base::MessageLoopForUI message_loop_;
183 183
184 scoped_ptr<SyntheticGestureControllerNew> controller_; 184 scoped_ptr<SyntheticGestureControllerNew> controller_;
185 scoped_ptr<MockSyntheticGestureTarget> target_; 185 scoped_ptr<MockSyntheticGestureTarget> target_;
186 const MockSyntheticGestureTarget* target_ptr_; 186 const MockSyntheticGestureTarget* target_ptr_;
187 }; 187 };
188 188
189 TEST_F(SyntheticGestureControllerNewTest, SingleGesture) { 189 // http://crbug.com/314272
190 #if defined(OS_WIN)
191 #define MAYBE_SingleGesture DISABLED_SingleGesture
192 #else
193 #define MAYBE_SingleGesture SingleGesture
194 #endif
195 TEST_F(SyntheticGestureControllerNewTest, MAYBE_SingleGesture) {
190 bool finished; 196 bool finished;
191 scoped_ptr<MockSyntheticGesture> gesture( 197 scoped_ptr<MockSyntheticGesture> gesture(
192 new MockSyntheticGesture(&finished, 3)); 198 new MockSyntheticGesture(&finished, 3));
193 controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>()); 199 controller_->QueueSyntheticGesture(gesture.PassAs<SyntheticGestureNew>());
194 PostQuitMessageAndRun(30); 200 PostQuitMessageAndRun(30);
195 201
196 EXPECT_TRUE(finished); 202 EXPECT_TRUE(finished);
197 EXPECT_EQ(1, target_ptr_->num_success()); 203 EXPECT_EQ(1, target_ptr_->num_success());
198 EXPECT_EQ(0, target_ptr_->num_failure()); 204 EXPECT_EQ(0, target_ptr_->num_failure());
199 } 205 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 PostQuitMessageAndRun(30); 299 PostQuitMessageAndRun(30);
294 300
295 EXPECT_EQ(1, smooth_scroll_mouse_target_ptr->num_success()); 301 EXPECT_EQ(1, smooth_scroll_mouse_target_ptr->num_success());
296 EXPECT_EQ(0, smooth_scroll_mouse_target_ptr->num_failure()); 302 EXPECT_EQ(0, smooth_scroll_mouse_target_ptr->num_failure());
297 EXPECT_GE(params.distance, smooth_scroll_mouse_target_ptr->scroll_distance()); 303 EXPECT_GE(params.distance, smooth_scroll_mouse_target_ptr->scroll_distance());
298 } 304 }
299 305
300 } // namespace 306 } // namespace
301 307
302 } // namespace content 308 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698