Add native-side unit test for Android NetworkChangeNotifier

net/android/network_change_notifier_android.h

Index: net/android/network_change_notifier_android.h
diff --git a/net/android/network_change_notifier_android.h b/net/android/network_change_notifier_android.h
index 3c71dc5995bb31fdfacf88b46fc8e37ce2cb8106..2824600964cc4fa7066e38f005f24a7e1e4d7565 100644
--- a/net/android/network_change_notifier_android.h
+++ b/net/android/network_change_notifier_android.h
@@ -11,30 +11,32 @@
 #include "net/base/network_change_notifier.h"
 
 namespace net {
-namespace android {
 
-class NetworkChangeNotifier : public net::NetworkChangeNotifier {
+class NetworkChangeNotifierAndroidTest;
+
+class NetworkChangeNotifierAndroid : public NetworkChangeNotifier {
  public:
-  NetworkChangeNotifier();
-  virtual ~NetworkChangeNotifier();
+  NetworkChangeNotifierAndroid();
+  virtual ~NetworkChangeNotifierAndroid();
 
-  void NotifyObservers(JNIEnv* env, jobject obj);
+  void NotifyObserversOfConnectionTypeChange(JNIEnv* env, jobject obj);
 
   static bool Register(JNIEnv* env);
 
  private:
-  void CreateJavaObject(JNIEnv* env);
+  friend class NetworkChangeNotifierAndroidTest;
 
   // NetworkChangeNotifier:
-  virtual net::NetworkChangeNotifier::ConnectionType
+  virtual NetworkChangeNotifier::ConnectionType
       GetCurrentConnectionType() const OVERRIDE;
 
+  void ForceConnectivityState(bool state);
+
   base::android::ScopedJavaGlobalRef<jobject> java_network_change_notifier_;
 
-  DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
+  DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierAndroid);
 };
 
-}  // namespace android
 }  // namespace net
 
 #endif  // NET_ANDROID_NETWORK_CHANGE_NOTIFIER_ANDROID_H_