OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/memory/scoped_vector.h" | 6 #include "base/memory/scoped_vector.h" |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
9 #include "base/timer/timer.h" | 9 #include "base/timer/timer.h" |
10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
675 public: | 675 public: |
676 GestureRecognizerTest() {} | 676 GestureRecognizerTest() {} |
677 | 677 |
678 bool UsingUnifiedGR() { | 678 bool UsingUnifiedGR() { |
679 return GetParam(); | 679 return GetParam(); |
680 } | 680 } |
681 | 681 |
682 virtual void SetUp() OVERRIDE { | 682 virtual void SetUp() OVERRIDE { |
683 // TODO(tdresser): Once unified GR has landed, only run these tests once. | 683 // TODO(tdresser): Once unified GR has landed, only run these tests once. |
684 if (UsingUnifiedGR()) { | 684 if (UsingUnifiedGR()) { |
685 CommandLine::ForCurrentProcess()->AppendSwitch( | 685 // TODO - re-enable these tests once memory management issues have been |
686 switches::kUseUnifiedGestureDetector); | 686 // sorted out. See crbug.com/371990. |
687 // CommandLine::ForCurrentProcess()->AppendSwitch( | |
688 // switches::kUseUnifiedGestureDetector); | |
687 } | 689 } |
sadrul
2014/05/09 20:39:23
Instead of running the tests twice with the aura G
| |
688 | 690 |
689 AuraTestBase::SetUp(); | 691 AuraTestBase::SetUp(); |
690 } | 692 } |
691 | 693 |
692 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerTest); | 694 DISALLOW_COPY_AND_ASSIGN(GestureRecognizerTest); |
693 }; | 695 }; |
694 | 696 |
695 // Check that appropriate touch events generate tap gesture events. | 697 // Check that appropriate touch events generate tap gesture events. |
696 TEST_P(GestureRecognizerTest, GestureEventTap) { | 698 TEST_P(GestureRecognizerTest, GestureEventTap) { |
697 scoped_ptr<GestureEventConsumeDelegate> delegate( | 699 scoped_ptr<GestureEventConsumeDelegate> delegate( |
(...skipping 3581 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4279 DispatchEventUsingWindowDispatcher(&move1); | 4281 DispatchEventUsingWindowDispatcher(&move1); |
4280 EXPECT_NE(default_flags, delegate->flags()); | 4282 EXPECT_NE(default_flags, delegate->flags()); |
4281 } | 4283 } |
4282 | 4284 |
4283 INSTANTIATE_TEST_CASE_P(GestureRecognizer, | 4285 INSTANTIATE_TEST_CASE_P(GestureRecognizer, |
4284 GestureRecognizerTest, | 4286 GestureRecognizerTest, |
4285 ::testing::Bool()); | 4287 ::testing::Bool()); |
4286 | 4288 |
4287 } // namespace test | 4289 } // namespace test |
4288 } // namespace aura | 4290 } // namespace aura |
OLD | NEW |