Fixing frame rate tests that depend on head_animation.js

Small oversight in r112774: function __update_fps replaced with
__record_frame_time in head.js. __update_fps was still referenced
in head_animation.js

BUG=http://code.google.com/p/chromium/issues/detail?id=106557
TEST=performance_ui_tests, gpu_frame_rate_test

Review URL: http://codereview.chromium.org/8915020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114639 0039d316-1c4b-4281-b951-d872f2087c98

chrome/test/data/perf/frame_rate/head_animation.js

@@ -48,7 +48,7 @@ function __did_render_frame() {
 
   if (__running) {
     __advance_gesture();
-    __update_fps();
+    __record_frame_time();
   }
 }
 

chrome/test/perf/frame_rate/frame_rate_tests.cc

@@ -274,7 +274,7 @@ INSTANTIATE_TEST_CASE_P(, FrameRateNoVsyncCanvasInternalTest, ::testing::Values(
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
 
-INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(DISABLED_fishbowl)
+INTERNAL_FRAME_RATE_TEST_CANVAS_WITH_AND_WITHOUT_NOVSYNC(fishbowl)
 
 typedef FrameRateTest FrameRateGpuCanvasInternalTest;
 
@@ -292,8 +292,8 @@ INSTANTIATE_TEST_CASE_P(, FrameRateGpuCanvasInternalTest, ::testing::Values(
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu,
     kUseReferenceBuild | kInternal | kHasRedirect | kUseGpu | kDisableVsync));
 
-INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(DISABLED_fireflies)
-INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(DISABLED_FishIE)
-INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(DISABLED_speedreading)
+INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(fireflies)
+INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(FishIE)
+INTERNAL_FRAME_RATE_TEST_CANVAS_GPU(speedreading)
 
 }  // namespace