Combine webrtc/api/java/android and webrtc/api/java/src.

webrtc/api/java/jni/androidnetworkmonitor_jni.h

Index: webrtc/api/java/jni/androidnetworkmonitor_jni.h
diff --git a/webrtc/api/java/jni/androidnetworkmonitor_jni.h b/webrtc/api/java/jni/androidnetworkmonitor_jni.h
deleted file mode 100644
index 2537ce8ef4e46035d8065a931994f685ff6803dc..0000000000000000000000000000000000000000
--- a/webrtc/api/java/jni/androidnetworkmonitor_jni.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
-#define WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_
-
-#include "webrtc/base/networkmonitor.h"
-
-#include <map>
-
-#include "webrtc/api/java/jni/jni_helpers.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/thread_checker.h"
-
-namespace webrtc_jni {
-
-typedef uint32_t NetworkHandle;
-
-// c++ equivalent of java NetworkMonitorAutoDetect.ConnectionType.
-enum NetworkType {
-  NETWORK_UNKNOWN,
-  NETWORK_ETHERNET,
-  NETWORK_WIFI,
-  NETWORK_4G,
-  NETWORK_3G,
-  NETWORK_2G,
-  NETWORK_BLUETOOTH,
-  NETWORK_NONE
-};
-
-// The information is collected from Android OS so that the native code can get
-// the network type and handle (Android network ID) for each interface.
-struct NetworkInformation {
-  std::string interface_name;
-  NetworkHandle handle;
-  NetworkType type;
-  std::vector<rtc::IPAddress> ip_addresses;
-
-  std::string ToString() const;
-};
-
-class AndroidNetworkMonitor : public rtc::NetworkMonitorBase,
-                              public rtc::NetworkBinderInterface {
- public:
-  AndroidNetworkMonitor();
-
-  static void SetAndroidContext(JNIEnv* jni, jobject context);
-
-  void Start() override;
-  void Stop() override;
-
-  int BindSocketToNetwork(int socket_fd,
-                          const rtc::IPAddress& address) override;
-  rtc::AdapterType GetAdapterType(const std::string& if_name) override;
-  void OnNetworkConnected(const NetworkInformation& network_info);
-  void OnNetworkDisconnected(NetworkHandle network_handle);
-  void SetNetworkInfos(const std::vector<NetworkInformation>& network_infos);
-
- private:
-  JNIEnv* jni() { return AttachCurrentThreadIfNeeded(); }
-
-  void OnNetworkConnected_w(const NetworkInformation& network_info);
-  void OnNetworkDisconnected_w(NetworkHandle network_handle);
-
-  ScopedGlobalRef<jclass> j_network_monitor_class_;
-  ScopedGlobalRef<jobject> j_network_monitor_;
-  rtc::ThreadChecker thread_checker_;
-  static jobject application_context_;
-  bool started_ = false;
-  std::map<std::string, rtc::AdapterType> adapter_type_by_name_;
-  std::map<rtc::IPAddress, NetworkHandle> network_handle_by_address_;
-  std::map<NetworkHandle, NetworkInformation> network_info_by_handle_;
-};
-
-class AndroidNetworkMonitorFactory : public rtc::NetworkMonitorFactory {
- public:
-  AndroidNetworkMonitorFactory() {}
-
-  rtc::NetworkMonitorInterface* CreateNetworkMonitor() override;
-};
-
-}  // namespace webrtc_jni
-
-#endif  // WEBRTC_API_JAVA_JNI_ANDROIDNETWORKMONITOR_JNI_H_