Temporarily makes use_aura the default on windows so we can get perf

chrome/test/perf/frame_rate/frame_rate_tests.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
@@ skipping 127 matching lines @@
   void RunTest(const std::string& name) {
 #if defined(OS_WIN)
     if (HasFlag(kUseGpu) && HasFlag(kIsGpuCanvasTest) &&
         base::win::OSInfo::GetInstance()->version() == base::win::VERSION_XP) {
       // crbug.com/128208
       LOG(WARNING) << "Test skipped: GPU canvas tests do not run on XP.";
       return;
     }
 #endif
 
     if (HasFlag(kUseGpu) && !IsGpuAvailable()) {

[jbates, 2013/01/31 17:08:39]

If this Aura run is meant to stay, best to put the check here and cancel the
test (it runs in both GPU and software modes, so this will just skip the
software run):
#if defined(USE_AURA)
if (!HasFlag(kUseGpu)) {
 printf("Test skipped, Aura always runs with GPU\n");
 return;
}

       printf("Test skipped: requires gpu. Pass --enable-gpu on the command "
              "line if use of GPU is desired.\n");
       return;
     }
 
     // Verify flag combinations.
     ASSERT_TRUE(HasFlag(kUseGpu) || !HasFlag(kForceGpuComposited));
     ASSERT_TRUE(!HasFlag(kUseGpu) || IsGpuAvailable());
 
     FilePath test_path = GetDataPath(name);
@@ skipping 40 matching lines @@
     }
 
     // Start the tests.
     ASSERT_TRUE(tab->NavigateToURLAsync(GURL("javascript:__start_all();")));
 
     // Block until the tests completes.
     ASSERT_TRUE(WaitUntilJavaScriptCondition(
         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;
       ASSERT_TRUE(automation()->EndTracing(&json_events));
 
       bool did_run_on_gpu = DidRunOnGpu(json_events);
       bool expect_gpu = HasFlag(kUseGpu);
       EXPECT_EQ(expect_gpu, did_run_on_gpu);
     }
+#endif
 
     // Read out the results.
     std::wstring json;
     ASSERT_TRUE(tab->ExecuteAndExtractString(
         L"",
         L"window.domAutomationController.send("
         L"JSON.stringify(__calc_results_total()));",
         &json));
 
     std::map<std::string, std::string> results;
@@ skipping 76 matching lines @@
     kIsGpuCanvasTest | kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     kIsGpuCanvasTest | kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu |
         kDisableVsync));
 
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
 INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
 
 }  // namespace