| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <map> | 5 #include <map> |
| 6 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
| (...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 654 "ms"); | 654 "ms"); |
| 655 | 655 |
| 656 receiver->Analyze(test_name, GetSuffixForTestFlags()); | 656 receiver->Analyze(test_name, GetSuffixForTestFlags()); |
| 657 | 657 |
| 658 AnalyzeLatency(test_name, analyzer.get()); | 658 AnalyzeLatency(test_name, analyzer.get()); |
| 659 } | 659 } |
| 660 }; | 660 }; |
| 661 | 661 |
| 662 } // namespace | 662 } // namespace |
| 663 | 663 |
| 664 // crbug.com/356842 | 664 IN_PROC_BROWSER_TEST_P(CastV2PerformanceTest, Performance) { |
| 665 IN_PROC_BROWSER_TEST_P(CastV2PerformanceTest, DISABLED_Performance) { | |
| 666 RunTest("CastV2Performance"); | 665 RunTest("CastV2Performance"); |
| 667 } | 666 } |
| 668 | 667 |
| 669 // Note: First argument is optional and intentionally left blank. | 668 // Note: First argument is optional and intentionally left blank. |
| 670 // (it's a prefix for the generated test cases) | 669 // (it's a prefix for the generated test cases) |
| 671 INSTANTIATE_TEST_CASE_P( | 670 INSTANTIATE_TEST_CASE_P( |
| 672 , | 671 , |
| 673 CastV2PerformanceTest, | 672 CastV2PerformanceTest, |
| 674 testing::Values( | 673 testing::Values( |
| 675 kUseGpu | k24fps, | 674 kUseGpu | k24fps, |
| 676 kUseGpu | k30fps, | 675 kUseGpu | k30fps, |
| 677 kUseGpu | k60fps, | 676 kUseGpu | k60fps, |
| 678 kUseGpu | k24fps | kDisableVsync, | 677 kUseGpu | k24fps | kDisableVsync, |
| 679 kUseGpu | k30fps | kProxyWifi, | 678 kUseGpu | k30fps | kProxyWifi, |
| 680 kUseGpu | k30fps | kProxyBad, | 679 kUseGpu | k30fps | kProxyBad, |
| 681 kUseGpu | k30fps | kSlowClock, | 680 kUseGpu | k30fps | kSlowClock, |
| 682 kUseGpu | k30fps | kFastClock)); | 681 kUseGpu | k30fps | kFastClock)); |
| OLD | NEW |