tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index dc74f51c363ee8d8c3eb01bd89ff4f7c64b95009..ccb2907c70119c2725562983d5db14c27c63b9e7 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -25330,6 +25330,50 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   </summary>
 </histogram>
 
+<histogram name="NCN.getNetInfo1stSuccess"
+    enum="BooleanAvoidedNullPointerException">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    True if the first call to ConnectivityManager.getNetworkInfo(Network) did
+    not throw NullPointerException, false if it did. Useful for investigating
+    and avoiding unexpected exceptions, see http://crbug.com/592131.
+  </summary>
+</histogram>
+
+<histogram name="NCN.getNetInfo2ndSuccess"
+    enum="BooleanAvoidedNullPointerException">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Recorded after the first call to ConnectivityManager.getNetworkInfo(Network)
+    threw a NullPointerException. True if the second call to
+    ConnectivityManager.getNetworkInfo(Network) did not throw
+    NullPointerException, false if it did. Useful for investigating and avoiding
+    unexpected exceptions, see http://crbug.com/592131.
+  </summary>
+</histogram>
+
+<histogram name="NCN.getWifiInfo1stSuccess"
+    enum="BooleanAvoidedNullPointerException">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    True if the first call to WifiManager.getConnectionInfo() did not throw
+    NullPointerException, false if it did. Useful for investigating and avoiding
+    unexpected exceptions, see http://crbug.com/592131.
+  </summary>
+</histogram>
+
+<histogram name="NCN.getWifiInfo2ndSuccess"
+    enum="BooleanAvoidedNullPointerException">
+  <owner>pauljensen@chromium.org</owner>
+  <summary>
+    Recorded after the first call to WifiManager.getConnectionInfo() threw a
+    NullPointerException. True if the second call to
+    ConnectivityManager.getNetworkInfo(Network) did not throw
+    NullPointerException, false if it did. Useful for investigating and avoiding
+    unexpected exceptions, see http://crbug.com/592131.
+  </summary>
+</histogram>
+
 <histogram name="NCN.IPAddressChange" units="ms">
   <owner>pauljensen@chromium.org</owner>
   <summary>Time between IP address change messages.</summary>
@@ -65114,6 +65158,11 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <int value="1" label="Available"/>
 </enum>
 
+<enum name="BooleanAvoidedNullPointerException" type="int">
+  <int value="0" label="Had NullPointerException"/>
+  <int value="1" label="No exception"/>
+</enum>
+
 <enum name="BooleanBlocked" type="int">
   <int value="0" label="Not Blocked"/>
   <int value="1" label="Blocked"/>