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

net/base/network_change_notifier.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 310 matching lines @@
   // Returns the device's current default network connection. This is the
   // network used for newly created socket communication for sockets that are
   // not explicitly bound to a particular network (e.g. via
   // DatagramClientSocket.BindToNetwork). Returns |kInvalidNetworkHandle| if
   // there is no default connected network.
   // Only implemented for Android (Lollipop and newer), returns
   // |kInvalidNetworkHandle| when unimplemented.
   // 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);
 
 #if defined(OS_LINUX)
   // Returns the AddressTrackerLinux if present.
   static const internal::AddressTrackerLinux* GetAddressTracker();
 #endif
 
   // Convenience method to determine if the user is offline.
@@ skipping 160 matching lines @@
   // cheap as they are called often.
   virtual ConnectionType GetCurrentConnectionType() const = 0;
   virtual void GetCurrentMaxBandwidthAndConnectionType(
       double* max_bandwidth_mbps,
       ConnectionType* connection_type) const;
   virtual bool AreNetworkHandlesCurrentlySupported() const;
   virtual void GetCurrentConnectedNetworks(NetworkList* network_list) const;
   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.
   virtual void OnFinalizingMetricsLogRecord() {}
 
   // Broadcasts a notification to all registered observers.  Note that this
   // happens asynchronously, even for observers on the current thread, even in
   // tests.
   static void NotifyObserversOfIPAddressChange();
   static void NotifyObserversOfConnectionTypeChange();
@@ skipping 54 matching lines @@
 
   // Set true to disable non-test notifications (to prevent flakes in tests).
   static bool test_notifications_only_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CHANGE_NOTIFIER_H_