Fix frame_rate_tests for Vista.

chrome/test/perf/frame_rate/frame_rate_tests.cc

 // Copyright (c) 2011 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 81 matching lines @@
 
     // Some of the tests may launch http requests through JSON or AJAX
     // which causes a security error (cross domain request) when the page
     // is loaded from the local file system ( file:// ). The following switch
     // fixes that error.
     launch_arguments_.AppendSwitch(switches::kAllowFileAccessFromFiles);
 
     if (!HasFlag(kUseGpu)) {
       launch_arguments_.AppendSwitch(switches::kDisableAcceleratedCompositing);
       launch_arguments_.AppendSwitch(switches::kDisableExperimentalWebGL);
+      launch_arguments_.AppendSwitch(switches::kDisableAccelerated2dCanvas);
     } else {
       // This switch is required for enabling the accelerated 2d canvas on
       // Chrome versions prior to Chrome 15, which may be the case for the
       // reference build.
       launch_arguments_.AppendSwitch(switches::kEnableAccelerated2dCanvas);
     }
 
     if (HasFlag(kDisableVsync))
       launch_arguments_.AppendSwitch(switches::kDisableGpuVsync);
 
     UIPerfTest::SetUp();
   }
 
   bool DidRunOnGpu(const std::string& json_events) {
     using namespace trace_analyzer;
 
     // Check trace for GPU accleration.
     scoped_ptr<TraceAnalyzer> analyzer(TraceAnalyzer::Create(json_events));
 
     gfx::GLImplementation gl_impl = gfx::kGLImplementationNone;
     const TraceEvent* gpu_event = analyzer->FindOneEvent(
-        Query(EVENT_NAME) == Query::String("GLES2DecoderImpl::Initialize") &&
+        Query(EVENT_NAME) == Query::String("SwapBuffers") &&
         Query(EVENT_HAS_NUMBER_ARG, "GLImpl"));
     if (gpu_event)
       gl_impl = static_cast<gfx::GLImplementation>(
           gpu_event->GetKnownArgAsInt("GLImpl"));
     return (gl_impl == gfx::kGLImplementationDesktopGL ||
             gl_impl == gfx::kGLImplementationEGLGLES2);
   }
 
   void RunTest(const std::string& name) {
     if (HasFlag(kUseGpu) && !IsGpuAvailable()) {
@@ skipping 148 matching lines @@
     kInternal | kHasRedirect | kUseGpu,
     kInternal | kHasRedirect | kUseGpu | kDisableVsync,
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     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