Adding visible networks to the Geolocation Header.

chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.omnibox.geo;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.location.Location;
@@ skipping 13 matching lines @@
  * getLastKnownLocation() returns the current best estimate of the location. If possible, call
  * refreshLastKnownLocation() several seconds before a location is needed to maximize the chances
  * that the location is known.
  */
 class GeolocationTracker {
 
     private static SelfCancelingListener sListener;
     private static Location sNetworkLocationForTesting;
     private static Location sGpsLocationForTesting;
     private static boolean sUseLocationForTesting;
+    private static long sLocationAgeForTesting;
+    private static boolean sUseLocationAgeForTesting;
 
     private static class SelfCancelingListener implements LocationListener {
 
         // Length of time before the location request should be canceled. This timeout ensures the
         // device doesn't get stuck in an infinite loop trying and failing to get a location, which
         // would cause battery drain. See: http://crbug.com/309917
         private static final int REQUEST_TIMEOUT_MS = 60 * 1000;  // 60 sec.
 
         private final LocationManager mLocationManager;
         private final Handler mHandler;
@@ skipping 27 matching lines @@
         @Override
         public void onStatusChanged(String provider, int status, Bundle extras) { }
     }
 
     /**
      * Returns the age of location is milliseconds.
      * Note: the age will be invalid if the system clock has been changed since the location was
      * created. If the apparent age is negative, Long.MAX_VALUE will be returned.
      */
     static long getLocationAge(Location location) {
+        if (sUseLocationAgeForTesting) return sLocationAgeForTesting;

[Ted C, 2017/05/18 14:43:03]

same comment as the other cl where I think we can use the shadow system clock to
do this

[lbargu, 2017/05/18 15:14:09]

Not sure it would work since age is using "current time", not "elapsed time".
I can't find a way to shadow current time. Am I missing something?

         long age = System.currentTimeMillis() - location.getTime();
         return age >= 0 ? age : Long.MAX_VALUE;
     }
 
     /**
      * Returns the last known location or null if none is available.
      *
      * @param includeGpsFallback Whether the gps provider should also be used as a fallback.
      *        Otherwise only the network provider will be used.
      */
@@ skipping 54 matching lines @@
     }
 
     @VisibleForTesting
     static void setLocationForTesting(
             Location networkLocationForTesting, Location gpsLocationForTesting) {
         sNetworkLocationForTesting = networkLocationForTesting;
         sGpsLocationForTesting = gpsLocationForTesting;
         sUseLocationForTesting = true;
     }
 
+    @VisibleForTesting
+    static void setLocationAgeForTesting(Long locationAgeForTesting) {
+        if (locationAgeForTesting == null) {
+            sUseLocationAgeForTesting = false;
+            return;
+        }
+        sLocationAgeForTesting = locationAgeForTesting;
+        sUseLocationAgeForTesting = true;
+    }
+
     private static boolean hasPermission(Context context, String permission) {
         return ApiCompatibilityUtils.checkPermission(
                        context, permission, Process.myPid(), Process.myUid())
                 == PackageManager.PERMISSION_GRANTED;
     }
 
     private static Location chooseLocation(
             Location networkLocation, Location gpsLocation, boolean includeGpsFallback) {
         if (!includeGpsFallback || gpsLocation == null) {
             return networkLocation;
         }
 
         if (networkLocation == null) {
             return gpsLocation;
         }
 
         // Both are not null, take the younger one.
         return networkLocation.getTime() > gpsLocation.getTime() ? networkLocation : gpsLocation;
     }
 }