Create //webrtc/api:libjingle_peerconnection_api + refactorings.

webrtc/pc/rtcstatscollector.h

Index: webrtc/pc/rtcstatscollector.h
diff --git a/webrtc/api/rtcstatscollector.h b/webrtc/pc/rtcstatscollector.h
similarity index 94%
rename from webrtc/api/rtcstatscollector.h
rename to webrtc/pc/rtcstatscollector.h
index cd3c55ee8971e52476b61d836b4d4a5601287aa5..de0af33914d2c68e427d43f064432a0a44111c82 100644
--- a/webrtc/api/rtcstatscollector.h
+++ b/webrtc/pc/rtcstatscollector.h
@@ -8,17 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_API_RTCSTATSCOLLECTOR_H_
-#define WEBRTC_API_RTCSTATSCOLLECTOR_H_
+#ifndef WEBRTC_PC_RTCSTATSCOLLECTOR_H_
+#define WEBRTC_PC_RTCSTATSCOLLECTOR_H_
 
 #include <map>
 #include <memory>
 #include <set>
 #include <vector>
 
-#include "webrtc/api/datachannel.h"
-#include "webrtc/api/datachannelinterface.h"
 #include "webrtc/api/stats/rtcstats_objects.h"
+#include "webrtc/api/stats/rtcstatscollectorcallback.h"
 #include "webrtc/api/stats/rtcstatsreport.h"
 #include "webrtc/api/trackmediainfomap.h"
 #include "webrtc/base/asyncinvoker.h"
@@ -29,6 +28,7 @@
 #include "webrtc/base/sslidentity.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/media/base/mediachannel.h"
+#include "webrtc/pc/datachannel.h"
 
 namespace cricket {
 class Candidate;
@@ -44,14 +44,6 @@ class PeerConnection;
 struct SessionStats;
 struct ChannelNamePairs;
 
-class RTCStatsCollectorCallback : public virtual rtc::RefCountInterface {
- public:
-  virtual ~RTCStatsCollectorCallback() {}
-
-  virtual void OnStatsDelivered(
-      const rtc::scoped_refptr<const RTCStatsReport>& report) = 0;
-};
-
 // All public methods of the collector are to be called on the signaling thread.
 // Stats are gathered on the signaling, worker and network threads
 // asynchronously. The callback is invoked on the signaling thread. Resulting
@@ -197,4 +189,4 @@ const char* DataStateToRTCDataChannelStateForTesting(
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_API_RTCSTATSCOLLECTOR_H_
+#endif  // WEBRTC_PC_RTCSTATSCOLLECTOR_H_