Revert 206020 "cc: Emulate BeginFrame in OutputSurfaces that don..."

This is causing pre-rendered pages to not load on android: crbug.com/249806

> cc: Emulate BeginFrame in OutputSurfaces that don't support it natively
> 
> This includes two small fixes for the original version of this
> patch that broke software compositing and WebView.
> 
> This will allow us to avoid having two different code paths
> in the Scheduler. It also allows us to more easily remove the
> VSyncTimeSource and FrameRateController from the Scheduler.
> 
> This patch instantiates the FrameRateController inside of
> OutputSurface for now, but the FrameRateController could be
> removed in future patches.
> 
> BUG=245920
> BUG=243497
> TBR=nduca@chromium.org,sievers@chromium.org,kbr@chromium.org
> 
> Review URL: https://chromiumcodereview.appspot.com/16833003

TBR=brianderson@chromium.org

Review URL: https://codereview.chromium.org/17204002

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

1 files changed, 5 insertions, 5 deletions

diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc
index 28423eb..de74e45 100644
--- a/chrome/test/perf/rendering/latency_tests.cc
+++ b/chrome/test/perf/rendering/latency_tests.cc
@@ -371,14 +371,14 @@ void LatencyTest::RunTest(const std::vector<int>& behaviors) {
     if (mode_ == kWebGLThread) {
       // Print vsync info when in threaded mode.
       Query query_vsync =
-          Query::EventNameIs("OutputSurface::OnVSyncParametersChanged") &&
-          Query::EventHasNumberArg("timebase") &&
-          Query::EventHasNumberArg("interval");
+          Query::EventNameIs("CCThreadProxy::onVSyncParametersChanged") &&
+          Query::EventHasNumberArg("monotonicTimebase") &&
+          Query::EventHasNumberArg("intervalInSeconds");
 
       const TraceEvent* vsync_info = analyzer_->FindFirstOf(query_vsync);
       if (vsync_info) {
-        double timebase = vsync_info->GetKnownArgAsDouble("timebase");
-        double interval = vsync_info->GetKnownArgAsDouble("interval");
+        double timebase = vsync_info->GetKnownArgAsDouble("monotonicTimebase");
+        double interval = vsync_info->GetKnownArgAsDouble("intervalInSeconds");
         printf("VSync scheduling: timebase = %f; interval = %f\n",
                timebase, interval);
       }