diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 23:33:52 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-16 23:33:52 +0000 |
| commit | 6a6db0a585e2908711cc87e69228ee0908627fdf (patch) | |
| tree | d8d07a8c64968d8df2a61eb1ae9261b6207aa2a7 | |
| parent | c28dd9ede5869f1d92af8334727f1d7c0f3a380f (diff) | |
| download | chromium_src-6a6db0a585e2908711cc87e69228ee0908627fdf.zip chromium_src-6a6db0a585e2908711cc87e69228ee0908627fdf.tar.gz chromium_src-6a6db0a585e2908711cc87e69228ee0908627fdf.tar.bz2 | |
Revert 228993 "Disable tab capture perf tests on Aura."
> Disable tab capture perf tests on Aura.
>
> This was recently re-enabled, but is failing on the Windows (Aura) GPU
> bots.
>
> TBR=hubbe@chromium.org
> BUG=308236
>
> Review URL: https://codereview.chromium.org/27537006
TBR=ccameron@chromium.org
Review URL: https://codereview.chromium.org/27613002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229002 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc index acac49b..b7b6978 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc @@ -231,15 +231,7 @@ class TabCapturePerformanceTest } // namespace -// This does not work on Aura GPU bots yet -// http://crbug.com/308236 -#if defined(USE_AURA) -#define MAYBE_TabCapturePerformanceTest DISABLED_TabCapturePerformanceTest -#else -#define MAYBE_TabCapturePerformanceTest TabCapturePerformanceTest -#endif - -IN_PROC_BROWSER_TEST_P(MAYBE_TabCapturePerformanceTest, Performance) { +IN_PROC_BROWSER_TEST_P(TabCapturePerformanceTest, Performance) { RunTest("TabCapturePerformance"); } @@ -258,7 +250,7 @@ INSTANTIATE_TEST_CASE_P( kTestThroughWebRTC | kDisableVsync, kTestThroughWebRTC | kDisableVsync | kUseGpu | kForceGpuComposited)); -#if defined(USE_AURA) +#ifdef USE_AURA // TODO(hubbe): // These are temporary tests for the purpose of determining what the // appropriate scaling quality is. Once that has been determined, |