tools: Fixes in customtabs_benchmark.

tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java

Index: tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java
diff --git a/tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java b/tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java
index 25ee24bbda3d4d3f13d26b65131ad2266887ba57..b1b336d46d39512fab62f319b3394cbe17613ac9 100644
--- a/tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java
+++ b/tools/android/customtabs_benchmark/java/src/org/chromium/customtabs/test/MainActivity.java
@@ -109,17 +109,11 @@ public class MainActivity extends Activity {
                     break;
                 case CustomTabsCallback.NAVIGATION_FINISHED:
                     mPageLoadFinishedMs = SystemClock.uptimeMillis();
-                    if (mIntentSentMs != NONE && mPageLoadStartedMs != NONE) {
-                        if (mFirstContentfulPaintMs != NONE) {
-                            logMetricsAndFinish();
-                        } else {
-                            logMetricsAndFinishDelayed(3000);

[droger, 2016/12/05 15:35:08]

Are you sure this was not useful?

The scenario I can think of is for a page that does not report the first
contentful paint.

With this call to logMetricsAndFinishDelayed, the test returns somewhat early (3
seconds after the load is complete).

With your change, I expect the full timeout to happen (like 20 seconds).

Maybe this happens rarely enough that we don't care.

[Benoit L, 2016/12/05 15:46:41]

Yes, this doesn't happen very often, and the code is simpler this way.
Acknowkledged.

-                        }
-                    }
                     break;
                 default:
                     break;
             }
+            if (allSet()) logMetricsAndFinish();
         }
 
         @Override
@@ -132,7 +126,12 @@ public class MainActivity extends Activity {
             if (mFirstContentfulPaintMs == NONE) {
                 mFirstContentfulPaintMs = navigationStartMs + firstPaintMs;
             }
-            if (mPageLoadFinishedMs != NONE) logMetricsAndFinish();
+            if (allSet()) logMetricsAndFinish();
+        }
+
+        private boolean allSet() {
+            return mIntentSentMs != NONE && mPageLoadStartedMs != NONE
+                    && mFirstContentfulPaintMs != NONE && mPageLoadFinishedMs != NONE;
         }
 
         /** Outputs the available metrics, and die. Unavalaible metrics are set to -1. */
@@ -153,7 +152,7 @@ public class MainActivity extends Activity {
                 public void run() {
                     logMetricsAndFinish();
                 }
-            }, 3000);
+            }, delayMs);
         }
     }