[CustomTabs] Report the navigation start as absolute time

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
index bd2b8fb54a8cff4317f4e7a52235e4ad06b9888b..c70a2cd907136264faa7c9f2a21f5183ef85aafb 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
@@ -24,6 +24,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.support.customtabs.CustomTabsCallback;
 import android.support.customtabs.CustomTabsClient;
 import android.support.customtabs.CustomTabsIntent;
@@ -820,13 +821,23 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
     @RetryOnFailure
     public void testPageLoadMetricIsSent() {
         final AtomicReference<Long> firstContentfulPaintMs = new AtomicReference<>(-1L);
+        final AtomicReference<Long> activityStartTimeMs = new AtomicReference<>(-1L);
+
         CustomTabsCallback cb = new CustomTabsCallback() {
             @Override
             public void extraCallback(String callbackName, Bundle args) {
                 assertEquals(CustomTabsConnection.PAGE_LOAD_METRICS_CALLBACK, callbackName);
-                long value = args.getLong(PageLoadMetrics.FIRST_CONTENTFUL_PAINT, -1);
-                assertTrue(value > 0);
-                firstContentfulPaintMs.set(value);
+
+                long navigationStart = args.getLong(PageLoadMetrics.NAVIGATION_START, -1);
+                long current = SystemClock.uptimeMillis();
+                assertTrue(navigationStart <= current);
+                assertTrue(navigationStart >= activityStartTimeMs.get());
+
+                long firstContentfulPaint =
+                        args.getLong(PageLoadMetrics.FIRST_CONTENTFUL_PAINT, -1);
+                assertTrue(firstContentfulPaint > 0);
+                assertTrue(firstContentfulPaint <= (current - navigationStart));
+                firstContentfulPaintMs.set(firstContentfulPaint);
             }
         };
 
@@ -838,6 +849,7 @@ public class CustomTabActivityTest extends CustomTabActivityTestBase {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         try {
+            activityStartTimeMs.set(SystemClock.uptimeMillis());
             startCustomTabActivityWithIntent(intent);
             CriteriaHelper.pollInstrumentationThread(new Criteria() {
                 @Override