Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/media_stream_center.cc

Index: content/renderer/media/media_stream_center.cc
diff --git a/content/renderer/media/media_stream_center.cc b/content/renderer/media/media_stream_center.cc
index e7e34dd0a189839fc4d8b3389905cfa4d02d9c46..145d340ef523050a66999fdb58665e115700b011 100644
--- a/content/renderer/media/media_stream_center.cc
+++ b/content/renderer/media/media_stream_center.cc
@@ -10,15 +10,15 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
+#include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/render_view_impl.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamCenterClient.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamComponent.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourcesRequest.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
@@ -26,7 +26,7 @@
 namespace content {
 
 static webrtc::MediaStreamInterface* GetNativeMediaStream(
-    const WebKit::WebMediaStreamDescriptor& stream) {
+    const WebKit::WebMediaStream& stream) {
   MediaStreamExtraData* extra_data =
       static_cast<MediaStreamExtraData*>(stream.extraData());
   if (extra_data && extra_data->remote_stream())
@@ -53,8 +53,8 @@ static webrtc::MediaStreamTrackInterface* GetTrack(
 }
 
 static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack(
-      const WebKit::WebMediaStreamDescriptor& stream,
-      const WebKit::WebMediaStreamComponent& component) {
+      const WebKit::WebMediaStream& stream,
+      const WebKit::WebMediaStreamTrack& component) {
   std::string source_id = UTF16ToUTF8(component.source().id());
   webrtc::MediaStreamInterface* native_stream = GetNativeMediaStream(stream);
   if (native_stream) {
@@ -85,8 +85,8 @@ void MediaStreamCenter::queryMediaStreamSources(
 }
 
 void MediaStreamCenter::didEnableMediaStreamTrack(
-    const WebKit::WebMediaStreamDescriptor& stream,
-    const WebKit::WebMediaStreamComponent& component) {
+    const WebKit::WebMediaStream& stream,
+    const WebKit::WebMediaStreamTrack& component) {
   webrtc::MediaStreamTrackInterface* track =
       GetNativeMediaStreamTrack(stream, component);
   if (track)
@@ -94,8 +94,8 @@ void MediaStreamCenter::didEnableMediaStreamTrack(
 }
 
 void MediaStreamCenter::didDisableMediaStreamTrack(
-    const WebKit::WebMediaStreamDescriptor& stream,
-    const WebKit::WebMediaStreamComponent& component) {
+    const WebKit::WebMediaStream& stream,
+    const WebKit::WebMediaStreamTrack& component) {
   webrtc::MediaStreamTrackInterface* track =
       GetNativeMediaStreamTrack(stream, component);
   if (track)
@@ -103,7 +103,7 @@ void MediaStreamCenter::didDisableMediaStreamTrack(
 }
 
 void MediaStreamCenter::didStopLocalMediaStream(
-    const WebKit::WebMediaStreamDescriptor& stream) {
+    const WebKit::WebMediaStream& stream) {
   DVLOG(1) << "MediaStreamCenter::didStopLocalMediaStream";
   MediaStreamExtraData* extra_data =
        static_cast<MediaStreamExtraData*>(stream.extraData());
@@ -116,7 +116,7 @@ void MediaStreamCenter::didStopLocalMediaStream(
 }
 
 void MediaStreamCenter::didCreateMediaStream(
-    WebKit::WebMediaStreamDescriptor& stream) {
+    WebKit::WebMediaStream& stream) {
   if (!rtc_factory_)
     return;
   rtc_factory_->CreateNativeLocalMediaStream(&stream);