Refactor NetworkChangeNotifierAndroid

net/android/network_change_notifier_delegate_android.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_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 #define NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_
 
 #include <map>
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "net/base/net_export.h"
 #include "net/base/network_change_notifier.h"
 
 namespace net {
 
 // Delegate used to thread-safely notify NetworkChangeNotifierAndroid whenever a
 // network connection change notification is signaled by the Java side (on the
 // JNI thread).
 // All the methods exposed below must be called exclusively on the JNI thread
 // unless otherwise stated (e.g. AddObserver()/RemoveObserver()).
 class NET_EXPORT_PRIVATE NetworkChangeNotifierDelegateAndroid {
  public:
   typedef NetworkChangeNotifier::ConnectionType ConnectionType;
+  typedef NetworkChangeNotifier::ConnectionSubtype ConnectionSubtype;
   typedef NetworkChangeNotifier::NetworkHandle NetworkHandle;
   typedef NetworkChangeNotifier::NetworkList NetworkList;
 
   // Observer interface implemented by NetworkChangeNotifierAndroid which
   // subscribes to network change notifications fired by the delegate (and
   // initiated by the Java side).
   class Observer : public NetworkChangeNotifier::NetworkObserver {
    public:
     ~Observer() override {}
 
@@ skipping 19 matching lines @@
       jlong default_netid);
   jint GetConnectionType(JNIEnv* env, jobject obj) const;
 
   // Called from NetworkChangeNotifier.java on the JNI thread whenever
   // the maximum bandwidth of the connection changes. This updates the current
   // max bandwidth seen by this class and forwards the notification to the
   // observers that subscribed through AddObserver().
   void NotifyMaxBandwidthChanged(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
-      jdouble new_max_bandwidth);
+      jint subtype);
 
   // Called from NetworkChangeNotifier.java on the JNI thread to push
   // down notifications of network connectivity events. These functions in
   // turn:
   //   1) Update |network_map_| and |default_network_|.
   //   2) Push notifications to NetworkChangeNotifier which in turn pushes
   //      notifications to its NetworkObservers. Note that these functions
   //      perform valuable transformations on the signals like deduplicating.
   // For descriptions of what individual calls mean, see
   // NetworkChangeNotifierAutoDetect.Observer functions of the same names.
@@ skipping 54 matching lines @@
   void SetCurrentNetworksAndTypes(NetworkMap network_map);
 
   // Methods calling the Java side exposed for testing.
   void SetOnline();
   void SetOffline();
   void FakeNetworkConnected(NetworkHandle network, ConnectionType type);
   void FakeNetworkSoonToBeDisconnected(NetworkHandle network);
   void FakeNetworkDisconnected(NetworkHandle network);
   void FakePurgeActiveNetworkList(NetworkList networks);
   void FakeDefaultNetwork(NetworkHandle network, ConnectionType type);
-  void FakeMaxBandwidthChanged(double max_bandwidth_mbps);
+  void FakeConnectionSubtypeChanged(ConnectionSubtype subtype);
 
   base::ThreadChecker thread_checker_;
   scoped_refptr<base::ObserverListThreadSafe<Observer>> observers_;
   base::android::ScopedJavaGlobalRef<jobject> java_network_change_notifier_;
 
   mutable base::Lock connection_lock_;  // Protects the state below.
   ConnectionType connection_type_;
   double connection_max_bandwidth_;
   NetworkHandle default_network_;
   NetworkMap network_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierDelegateAndroid);
 };
 
 }  // namespace net
 
 #endif  // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_DELEGATE_ANDROID_H_