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

Unified Diff: chrome/test/perf/frame_rate/frame_rate_tests.cc

Issue 12093083: Temporarily makes use_aura the default on windows so we can get perf (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 11 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/perf/frame_rate/frame_rate_tests.cc
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
index 4dfdc96b71601deac3ab0e23ca6265cd48a207f8..8f4449dffda3a1739a218ca7bd7b31919ee49195 100644
--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -206,6 +206,8 @@ class FrameRateTest
tab, L"", L"window.domAutomationController.send(!__running_all);",
TestTimeouts::large_test_timeout()));
+ // Aura is always accelerated.
+#if !defined(USE_AURA)
// TODO(jbates): remove this check when ref builds are updated.
if (!HasFlag(kUseReferenceBuild)) {
std::string json_events;
@@ -215,6 +217,7 @@ class FrameRateTest
bool expect_gpu = HasFlag(kUseGpu);
EXPECT_EQ(expect_gpu, did_run_on_gpu);
}
+#endif
// Read out the results.
std::wstring json;
« no previous file with comments | « build/common.gypi ('k') | chrome/test/ui/ui_test.cc » ('j') | chrome/test/ui/ui_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698