Expose API to detect when captive portal probe was blocked on Android

net/base/network_change_notifier.h

Index: net/base/network_change_notifier.h
diff --git a/net/base/network_change_notifier.h b/net/base/network_change_notifier.h
index 27a798d04d1fcf6d2714904324d31e26d18059bd..8ee88eb2182592a67736aa708d4c7da2790e0916 100644
--- a/net/base/network_change_notifier.h
+++ b/net/base/network_change_notifier.h
@@ -328,6 +328,12 @@ class NET_EXPORT NetworkChangeNotifier {
   // Requires NetworkHandles support, see AreNetworkHandlesSupported().
   static NetworkHandle GetDefaultNetwork();
 
+  // Returns true if the captive portal probe was blocked for the current

[pauljensen, 2016/11/16 16:10:23]

"the captive portal probe was blocked for"->"the system detected a captive
portal was present on"

+  // network. May incorrectly return true if the user has signed into the

[pauljensen, 2016/11/16 16:10:24]

network->default network

+  // captive portal since the network was last probed. Only available on
+  // Lollipop and newer releases.

[pauljensen, 2016/11/16 16:10:23]

Lollipop->Marshmallow

[pauljensen, 2016/11/16 16:10:24]

Mention it's only available on Android

[pauljensen, 2016/11/16 16:10:24]

Mention what is returned if unavailable

+  static bool GetNetworkCaptivePortal();
+
   // Retrieve the last read DnsConfig. This could be expensive if the system has
   // a large HOSTS file.
   static void GetDnsConfig(DnsConfig* config);
@@ -508,6 +514,7 @@ class NET_EXPORT NetworkChangeNotifier {
   virtual ConnectionType GetCurrentNetworkConnectionType(
       NetworkHandle network) const;
   virtual NetworkHandle GetCurrentDefaultNetwork() const;
+  virtual bool GetCurrentNetworkCaptivePortal() const;
 
   // Hook that allows derived implementations to log histograms at the time a
   // new histogram record is being finalized.