Include GPS location as a fallback. Only read it passively.

Include GPS location as a fallback. Only read it passively.

Only use this when the flag to switch ON visible networks is
enabled.

BUG=718475
Review-Url: https://codereview.chromium.org/2872653002
Cr-Commit-Position: refs/heads/master@{#470278}
Committed: https://chromium.googlesource.com/chromium/src/+/cf94195849ab0012e10cdc8f87156609a9ca3c8b

[lbargu, 2017-05-08 16:18:17]

Description was changed from

==========
Include GPS location as a fallback. Only read it passively.

Only use this when the flag to switch ON visible networks is
enabled.

BUG=718475
==========

to

==========
Include GPS location as a fallback. Only read it passively.

Only use this when the flag to switch ON visible networks is
enabled.

BUG=718475
==========

[lbargu, 2017-05-08 16:18:18]

lbargu@google.com changed reviewers:
+ dougt@chromium.org, tedchoc@chromium.org

[Ted C, 2017-05-09 04:51:48]

lgtm

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java
(right):

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java:274:
boolean includeGpsFallback = false;
not used?

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java
(right):

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:98:
Location gpsLocation =
locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
do we need to worry about catching permission access exceptions here?  can this
complain if we don't have  ACCESS_FINE_LOCATION (some custom roms have failed
for this in the past, but we might have fixed this further upstream in code).

[dougt, 2017-05-09 08:14:29]

I wrote up some nits, but they are optional.  lgtm.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java
(right):

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:87:
? chooseLocation(sNetworkLocationForTesting, sGpsLocationForTesting)
nit: consider expanding chooseLocation() to handle the |includeGpsFallback|
case.

This code could look like:

 if (sUseLocationForTesting)
  chooseLocation(includeGpsFallback, sNetworkLocationForTesting,
sGpsLocationForTesting);

Then in chooseLocation(), just have it return |sNetworkLocationForTesting| if
includeGpsFallback is true.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:94:
if (!includeGpsFallback) {
nit: comment states the obvious. Instead:

// If no GPS location has been request, just return the network location.
if (!includeGpsFallback)
  return networkLocation;

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:137:
} else if (networkLocation == null) {
optional: I've always found else's after returns to be confusing. non-sequitur,
in fact.

You might just want to rewrite this:

  if (gpsLocation == null)
    return networkLocation;

  if (networkLocation == null)
    return gpsLocation;

  // Both are not null, take the younger one.
  if (networkLocation.getTime() > gpsLocation.getTime())
    return networkLocation;

  return gpsLocation;

[lbargu, 2017-05-09 09:41:27]

Thanks for the review!

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java
(right):

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeader.java:274:
boolean includeGpsFallback = false;
On 2017/05/09 04:51:48, Ted C (OOO Tues) wrote:
> not used?

Done.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
File
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java
(right):

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:87:
? chooseLocation(sNetworkLocationForTesting, sGpsLocationForTesting)
On 2017/05/09 08:14:29, dougt wrote:
> nit: consider expanding chooseLocation() to handle the |includeGpsFallback|
> case.
> 
> This code could look like:
> 
>  if (sUseLocationForTesting)
>   chooseLocation(includeGpsFallback, sNetworkLocationForTesting,
> sGpsLocationForTesting);
> 
> Then in chooseLocation(), just have it return |sNetworkLocationForTesting| if
> includeGpsFallback is true.

Done.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:94:
if (!includeGpsFallback) {
On 2017/05/09 08:14:29, dougt wrote:
> nit: comment states the obvious. Instead:
> 
> // If no GPS location has been request, just return the network location.
> if (!includeGpsFallback)
>   return networkLocation;

Done.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:98:
Location gpsLocation =
locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
On 2017/05/09 04:51:48, Ted C (OOO Tues) wrote:
> do we need to worry about catching permission access exceptions here?  can
this
> complain if we don't have  ACCESS_FINE_LOCATION (some custom roms have failed
> for this in the past, but we might have fixed this further upstream in code).

Good point. Adding a check here should be safer.

https://codereview.chromium.org/2872653002/diff/1/chrome/android/java/src/org...
chrome/android/java/src/org/chromium/chrome/browser/omnibox/geo/GeolocationTracker.java:137:
} else if (networkLocation == null) {
On 2017/05/09 08:14:29, dougt wrote:
> optional: I've always found else's after returns to be confusing.
non-sequitur,
> in fact.
> 
> You might just want to rewrite this:
> 
>   if (gpsLocation == null)
>     return networkLocation;
> 
>   if (networkLocation == null)
>     return gpsLocation;
> 
>   // Both are not null, take the younger one.
>   if (networkLocation.getTime() > gpsLocation.getTime())
>     return networkLocation;
> 
>   return gpsLocation;

Done.

[lbargu, 2017-05-09 09:41:39]

The CQ bit was checked by lbargu@google.com

[lbargu, 2017-05-09 09:41:39]

The patchset sent to the CQ was uploaded after l-g-t-m from
tedchoc@chromium.org, dougt@chromium.org
Link to the patchset: https://codereview.chromium.org/2872653002/#ps20001
(title: "Include GPS location as a fallback. Only read it passively.")

[lbargu, 2017-05-09 09:41:41]

The CQ bit was unchecked by lbargu@google.com

[lbargu, 2017-05-09 09:45:41]

The CQ bit was checked by lbargu@google.com

[commit-bot: I haz the power, 2017-05-09 09:46:14]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-09 11:13:30]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1494323141643720,
"parent_rev": "4acaf3bab725f892e2c13e2e0fd4107f9fb48549", "commit_rev":
"cf94195849ab0012e10cdc8f87156609a9ca3c8b"}

[commit-bot: I haz the power, 2017-05-09 11:13:42]

Description was changed from

==========
Include GPS location as a fallback. Only read it passively.

Only use this when the flag to switch ON visible networks is
enabled.

BUG=718475
==========

to

==========
Include GPS location as a fallback. Only read it passively.

Only use this when the flag to switch ON visible networks is
enabled.

BUG=718475

Review-Url: https://codereview.chromium.org/2872653002
Cr-Commit-Position: refs/heads/master@{#470278}
Committed:
https://chromium.googlesource.com/chromium/src/+/cf94195849ab0012e10cdc8f8715...
==========

[commit-bot: I haz the power, 2017-05-09 11:13:43]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/cf94195849ab0012e10cdc8f8715...