Chromium Code Reviews| 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 665 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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 CommandLine::ForCurrentProcess()->AppendSwitch( |
| 686 switches::kUseUnifiedGestureDetector); | 686 switches::kUnifiedGestureDetector); |
|
sadrul
2014/05/22 18:45:25
Should you use AppendSwitchASCII(Detector, UsingUn
tdresser
2014/05/22 19:13:04
Done.
| |
| 687 } | 687 } |
| 688 | 688 |
| 689 AuraTestBase::SetUp(); | 689 AuraTestBase::SetUp(); |
| 690 } | 690 } |
| 691 | 691 |
| 692 virtual void TearDown() OVERRIDE { | 692 virtual void TearDown() OVERRIDE { |
| 693 AuraTestBase::TearDown(); | 693 AuraTestBase::TearDown(); |
| 694 RunAllPendingInMessageLoop(); | 694 RunAllPendingInMessageLoop(); |
| 695 } | 695 } |
| 696 | 696 |
| (...skipping 3571 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4268 } | 4268 } |
| 4269 | 4269 |
| 4270 // TODO - re-enable these tests once memory management issues have been sorted | 4270 // TODO - re-enable these tests once memory management issues have been sorted |
| 4271 // out. See crbug.com/371990. | 4271 // out. See crbug.com/371990. |
| 4272 INSTANTIATE_TEST_CASE_P(GestureRecognizer, | 4272 INSTANTIATE_TEST_CASE_P(GestureRecognizer, |
| 4273 GestureRecognizerTest, | 4273 GestureRecognizerTest, |
| 4274 ::testing::Bool()); | 4274 ::testing::Bool()); |
| 4275 | 4275 |
| 4276 } // namespace test | 4276 } // namespace test |
| 4277 } // namespace aura | 4277 } // namespace aura |
| OLD | NEW |