Add Geolocation.PermissionState histogram.

chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java
index 272278efceef71bc3828194b07d68eae5d1fc9fc..c63e0950fc07de68c4fbdd1fc19d6cd317411dfd 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java
@@ -14,6 +14,7 @@ import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.library_loader.ProcessInitException;
+import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.init.ChromeBrowserInitializer;
 import org.chromium.chrome.browser.preferences.website.ContentSetting;
@@ -74,6 +75,13 @@ public class GeolocationHeaderTest extends InstrumentationTestCase {
         assertNull(getHeaderWithLocation(20.3, 155.8, now - oneWeek));
         GeolocationTracker.setLocationForTesting(null);

[dominickn, 2016/11/30 00:08:46]

This line here erases the mock location set in this test. That may be the source
of the flakiness you're seeing.

[dominickn, 2016/11/30 00:21:06]

Though now that I look at it again, it shouldn't really matter by this point.
Hmm. Can you link to a trybot where we see that the GPS provider is used, not
network?

[pdyson, 2016/11/30 08:00:43]

I got the error with patch set 3 running linux_android_rel_ng. When I ran with
patch set 5 linux_android_rel_ng failed but did not seem to run this test.

patch set 3:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...

https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...

patch set 5:
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...

[dominickn, 2016/12/01 00:30:26]

Interesting. Once you have the latest version up, let's try seeing whether the
bots don't like it, and we can also test it locally with various location switch
configurations to see if we can track down the issue.

         assertNullHeader(SEARCH_URL_1, false);
+
+        // The values in this Histogram assert will change if the asserts above are altered.
+        assertHistogramEquals("GeolocationHeader.PermissionState", 57,
+                "0:4 1:5 2:4 3:0 4:0 5:0 6:0 7:0 8:0 9:0 10:0 11:0 12:0 13:0 14:0 15:0 16:0 17:0 "
+                        + "18:0 19:0 20:0 21:0 22:0 23:0 24:0 25:0 26:0 27:0 28:0 29:0 30:0 31:0 "
+                        + "32:0 33:0 34:0 35:0 36:0 37:9 38:0 39:0 40:0 41:0 42:0 43:0 44:0 45:0 "
+                        + "46:0 47:0 48:0 49:0 50:0 51:0 52:0 53:0 54:0 55:0 56:0 ");
     }
 
     private String getHeaderWithPermissions(ContentSetting httpsPermission,
@@ -114,4 +122,14 @@ public class GeolocationHeaderTest extends InstrumentationTestCase {
         Context targetContext = getInstrumentation().getTargetContext();
         assertNotNull(GeolocationHeader.getGeoHeader(targetContext, url, isIncognito));
     }
+
+    private void assertHistogramEquals(String name, int buckets, String output) {
+        String permissions = "";
+        for (int i = 0; i < buckets; i++) {
+            int count = RecordHistogram.getHistogramValueCountForTesting(name, i);
+            permissions =
+                    permissions.concat(Integer.toString(i) + ":" + Integer.toString(count) + " ");
+        }
+        assertEquals(output, permissions);
+    }
 }