Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / public / android / javatests / src / org / chromium / content / browser / VSyncMonitorTest.java

diff --git a/src/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java b/src/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
index a0274aa..59e0c62 100644 (file)
--- a/src/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
+++ b/src/content/public/android/javatests/src/org/chromium/content/browser/VSyncMonitorTest.java
@@ -5,10 +5,12 @@
 package org.chromium.content.browser;
 
 import android.content.Context;
+import android.os.SystemClock;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.ThreadUtils;
+import org.chromium.ui.VSyncMonitor;
 
 import java.util.Arrays;
 import java.util.concurrent.Callable;
@@ -37,7 +39,7 @@ public class VSyncMonitorTest extends InstrumentationTestCase {
 
         @Override
         public void onVSync(VSyncMonitor monitor, long vsyncTimeMicros) {
-            mLastVSyncCpuTimeMillis = System.currentTimeMillis();
+            mLastVSyncCpuTimeMillis = SystemClock.uptimeMillis();
             if (mPreviousVSyncTimeMicros == 0) {
                 mPreviousVSyncTimeMicros = vsyncTimeMicros;
                 return;
@@ -133,7 +135,7 @@ public class VSyncMonitorTest extends InstrumentationTestCase {
         monitor.stop();
 
         long period = monitor.getVSyncPeriodInMicroseconds() / 1000;
-        long delay = System.currentTimeMillis() - collector.mLastVSyncCpuTimeMillis;
+        long delay = SystemClock.uptimeMillis() - collector.mLastVSyncCpuTimeMillis;
 
         // The VSync should have activated immediately instead of at the next real vsync.
         assertTrue(delay < period);