Use only the steady gesture in frame rate tests.

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 66 matching lines @@
       test_path = test_path.Append(FILE_PATH_LITERAL("content"));
     }
     test_path = test_path.AppendASCII(name);
     return test_path;
   }
 
   virtual void SetUp() {
     if (HasFlag(kUseReferenceBuild))
       UseReferenceBuild();
 
+    // Turn on chrome.Interval to get higher-resolution timestamps on frames.
+    launch_arguments_.AppendSwitch(switches::kEnableBenchmarking);
+
+    // Required additional argument to make the kEnableBenchmarking switch work.
+    launch_arguments_.AppendSwitch(switches::kEnableStatsTable);
+
     // UI tests boot up render views starting from about:blank. This causes
     // the renderer to start up thinking it cannot use the GPU. To work
     // around that, and allow the frame rate test to use the GPU, we must
     // pass kAllowWebUICompositing.
     launch_arguments_.AppendSwitch(switches::kAllowWebUICompositing);
 
     // 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.
@@ skipping 28 matching lines @@
         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()) {
-      printf("Test skipped: requires gpu\n");
+      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);
     ASSERT_TRUE(file_util::DirectoryExists(test_path))
         << "Missing test directory: " << test_path.value();
@@ skipping 65 matching lines @@
 
     std::map<std::string, std::string> results;
     ASSERT_TRUE(JsonDictionaryToMap(WideToUTF8(json), &results));
 
     ASSERT_TRUE(results.find("mean") != results.end());
     ASSERT_TRUE(results.find("sigma") != results.end());
     ASSERT_TRUE(results.find("gestures") != results.end());
     ASSERT_TRUE(results.find("means") != results.end());
     ASSERT_TRUE(results.find("sigmas") != results.end());
 
-    std::string trace_name = "fps" + GetSuffixForTestFlags();
+    std::string trace_name = "interval" + GetSuffixForTestFlags();
     printf("GESTURES %s: %s= [%s] [%s] [%s]\n", name.c_str(),
                                                 trace_name.c_str(),
                                                 results["gestures"].c_str(),
                                                 results["means"].c_str(),
                                                 results["sigmas"].c_str());
 
     std::string mean_and_error = results["mean"] + "," + results["sigma"];
     PrintResultMeanAndError(name, "", trace_name, mean_and_error,
                             "frames-per-second", true);
   }
@@ skipping 51 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