Index: content/renderer/media/peer_connection_tracker.cc |
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc |
index 40cb37c071a2f42e34f458f3dc11c4342c01f515..3b3bac517fa6184136a95a016eb3d572f83d3839 100644 |
--- a/content/renderer/media/peer_connection_tracker.cc |
+++ b/content/renderer/media/peer_connection_tracker.cc |
@@ -8,7 +8,9 @@ |
#include <stdint.h> |
#include <memory> |
+#include <string> |
#include <utility> |
+#include <vector> |
#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
@@ -27,7 +29,7 @@ |
#include "third_party/WebKit/public/platform/WebRTCOfferOptions.h" |
#include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandlerClient.h" |
#include "third_party/WebKit/public/web/WebDocument.h" |
-#include "third_party/WebKit/public/web/WebFrame.h" |
+#include "third_party/WebKit/public/web/WebLocalFrame.h" |
#include "third_party/WebKit/public/web/WebUserMediaRequest.h" |
using webrtc::MediaConstraintsInterface; |
@@ -136,7 +138,7 @@ static const char* SerializeIceTransportType( |
break; |
default: |
NOTREACHED(); |
- }; |
+ } |
return transport_type; |
} |
@@ -155,7 +157,7 @@ static const char* SerializeBundlePolicy( |
break; |
default: |
NOTREACHED(); |
- }; |
+ } |
return policy_str; |
} |
@@ -171,7 +173,7 @@ static const char* SerializeRtcpMuxPolicy( |
break; |
default: |
NOTREACHED(); |
- }; |
+ } |
return policy_str; |
} |
@@ -312,7 +314,7 @@ static std::unique_ptr<base::DictionaryValue> GetDictValue( |
class InternalStatsObserver : public webrtc::StatsObserver { |
public: |
- InternalStatsObserver(int lid) |
+ explicit InternalStatsObserver(int lid) |
: lid_(lid), main_thread_(base::ThreadTaskRunnerHandle::Get()) {} |
void OnComplete(const StatsReports& reports) override { |
@@ -436,7 +438,7 @@ void PeerConnectionTracker::RegisterPeerConnection( |
RTCPeerConnectionHandler* pc_handler, |
const webrtc::PeerConnectionInterface::RTCConfiguration& config, |
const blink::WebMediaConstraints& constraints, |
- const blink::WebFrame* frame) { |
+ const blink::WebLocalFrame* frame) { |
DCHECK(main_thread_.CalledOnValidThread()); |
DCHECK_EQ(GetLocalIDForHandler(pc_handler), -1); |
DVLOG(1) << "PeerConnectionTracker::RegisterPeerConnection()"; |
@@ -588,7 +590,7 @@ void PeerConnectionTracker::TrackAddStream( |
void PeerConnectionTracker::TrackRemoveStream( |
RTCPeerConnectionHandler* pc_handler, |
const blink::WebMediaStream& stream, |
- Source source){ |
+ Source source) { |
DCHECK(main_thread_.CalledOnValidThread()); |
int id = GetLocalIDForHandler(pc_handler); |
if (id == -1) |