Revert of Break peerconnection_jni.cc into multiple files, in "pc" directory.

webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h

Index: webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
diff --git a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h b/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
deleted file mode 100644
index 2d9d749a6b2014f43820549c06da9d85d400d107..0000000000000000000000000000000000000000
--- a/webrtc/sdk/android/src/jni/pc/peerconnectionobserver_jni.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- *  Copyright 2017 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_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
-#define WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/sdk/android/src/jni/pc/mediaconstraints_jni.h"
-
-namespace webrtc_jni {
-
-// Adapter between the C++ PeerConnectionObserver interface and the Java
-// PeerConnection.Observer interface.  Wraps an instance of the Java interface
-// and dispatches C++ callbacks to Java.
-class PeerConnectionObserverJni : public webrtc::PeerConnectionObserver {
- public:
-  PeerConnectionObserverJni(JNIEnv* jni, jobject j_observer);
-  virtual ~PeerConnectionObserverJni();
-
-  // Implementation of PeerConnectionObserver interface, which propagates
-  // the callbacks to the Java observer.
-  void OnIceCandidate(const webrtc::IceCandidateInterface* candidate) override;
-  void OnIceCandidatesRemoved(
-      const std::vector<cricket::Candidate>& candidates) override;
-  void OnSignalingChange(
-      webrtc::PeerConnectionInterface::SignalingState new_state) override;
-  void OnIceConnectionChange(
-      webrtc::PeerConnectionInterface::IceConnectionState new_state) override;
-  void OnIceConnectionReceivingChange(bool receiving) override;
-  void OnIceGatheringChange(
-      webrtc::PeerConnectionInterface::IceGatheringState new_state) override;
-  void OnAddStream(
-      rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
-  void OnRemoveStream(
-      rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) override;
-  void OnDataChannel(
-      rtc::scoped_refptr<webrtc::DataChannelInterface> channel) override;
-  void OnRenegotiationNeeded() override;
-  void OnAddTrack(
-      rtc::scoped_refptr<webrtc::RtpReceiverInterface> receiver,
-      const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>&
-          streams) override;
-
-  void SetConstraints(MediaConstraintsJni* constraints);
-  const MediaConstraintsJni* constraints() { return constraints_.get(); }
-
- private:
-  typedef std::map<webrtc::MediaStreamInterface*, jobject>
-      NativeToJavaStreamsMap;
-  typedef std::map<webrtc::RtpReceiverInterface*, jobject>
-      NativeToJavaRtpReceiverMap;
-
-  void DisposeRemoteStream(const NativeToJavaStreamsMap::iterator& it);
-  void DisposeRtpReceiver(const NativeToJavaRtpReceiverMap::iterator& it);
-
-  // If the NativeToJavaStreamsMap contains the stream, return it.
-  // Otherwise, create a new Java MediaStream.
-  jobject GetOrCreateJavaStream(
-      const rtc::scoped_refptr<webrtc::MediaStreamInterface>& stream);
-
-  // Converts array of streams, creating or re-using Java streams as necessary.
-  jobjectArray NativeToJavaMediaStreamArray(
-      JNIEnv* jni,
-      const std::vector<rtc::scoped_refptr<webrtc::MediaStreamInterface>>&
-          streams);
-
-  const ScopedGlobalRef<jobject> j_observer_global_;
-  const ScopedGlobalRef<jclass> j_observer_class_;
-  const ScopedGlobalRef<jclass> j_media_stream_class_;
-  const jmethodID j_media_stream_ctor_;
-  const ScopedGlobalRef<jclass> j_audio_track_class_;
-  const jmethodID j_audio_track_ctor_;
-  const ScopedGlobalRef<jclass> j_video_track_class_;
-  const jmethodID j_video_track_ctor_;
-  const ScopedGlobalRef<jclass> j_data_channel_class_;
-  const jmethodID j_data_channel_ctor_;
-  const ScopedGlobalRef<jclass> j_rtp_receiver_class_;
-  const jmethodID j_rtp_receiver_ctor_;
-  // C++ -> Java remote streams. The stored jobects are global refs and must be
-  // manually deleted upon removal. Use DisposeRemoteStream().
-  NativeToJavaStreamsMap remote_streams_;
-  NativeToJavaRtpReceiverMap rtp_receivers_;
-  std::unique_ptr<MediaConstraintsJni> constraints_;
-};
-
-}  // namespace webrtc_jni
-
-#endif  // WEBRTC_SDK_ANDROID_SRC_JNI_PC_PEERCONNECTIONOBSERVER_JNI_H_