Use supported Android network handles in Android M and newer.

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 193 matching lines @@
     virtual ~MaxBandwidthObserver() {}
 
    private:
     DISALLOW_COPY_AND_ASSIGN(MaxBandwidthObserver);
   };
 
   // Opaque handle for device-wide connection to a particular network. For
   // example an association with a particular WiFi network with a particular
   // SSID or a connection to particular cellular network.
   // The meaning of this handle is target-dependent. On Android NetworkHandles
-  // are equivalent to the framework's concept of NetIDs (e.g. Network.netId).
-  typedef int32_t NetworkHandle;
+  // are equivalent to:
+  //   On Lollipop, the framework's concept of NetIDs (e.g. Network.netId), and
+  //   On Marshmallow and newer releases, network handles
+  //           (e.g. Network.getNetworkHandle()).
+  typedef int64_t NetworkHandle;
 
   // A list of networks.
   typedef std::vector<NetworkHandle> NetworkList;
 
   // An interface that when implemented and added via AddNeworkObserver(),
   // provides notifications when networks come and go.
   // Only implemented for Android (Lollipop and newer), no callbacks issued when
   // unimplemented.
   class NET_EXPORT NetworkObserver {
    public:
@@ skipping 346 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_