Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/media_stream_dependency_factory_unittest.cc

Index: content/renderer/media/media_stream_dependency_factory_unittest.cc
diff --git a/content/renderer/media/media_stream_dependency_factory_unittest.cc b/content/renderer/media/media_stream_dependency_factory_unittest.cc
index 00bf54584835af77624a7b99ebaba0045da454d6..5e93b96c9ee8be38dfa8a76b360f8362551058d5 100644
--- a/content/renderer/media/media_stream_dependency_factory_unittest.cc
+++ b/content/renderer/media/media_stream_dependency_factory_unittest.cc
@@ -9,13 +9,13 @@
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints.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/WebMediaStream.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSource.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
+#include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
 
 namespace content {
 
@@ -27,20 +27,20 @@ class MediaSourceCreatedObserver {
   }
 
   void OnCreateNativeSourcesComplete(
-      WebKit::WebMediaStreamDescriptor* description,
+      WebKit::WebMediaStream* description,
       bool request_succeeded) {
     result_ = request_succeeded;
     description_ = description;
   }
 
-  WebKit::WebMediaStreamDescriptor* description() const {
+  WebKit::WebMediaStream* description() const {
     return description_;
   }
   bool result() const { return result_; }
 
  private:
   bool result_;
-  WebKit::WebMediaStreamDescriptor* description_;
+  WebKit::WebMediaStream* description_;
 };
 
 class MediaStreamDependencyFactoryTest : public ::testing::Test {
@@ -49,7 +49,7 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test {
     dependency_factory_.reset(new MockMediaStreamDependencyFactory());
   }
 
-  WebKit::WebMediaStreamDescriptor CreateWebKitMediaStream(bool audio,
+  WebKit::WebMediaStream CreateWebKitMediaStream(bool audio,
                                                            bool video) {
     WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
                       audio ? static_cast<size_t>(1) : 0);
@@ -80,13 +80,13 @@ class MediaStreamDependencyFactoryTest : public ::testing::Test {
       video_sources[0].setExtraData(
               new MediaStreamSourceExtraData(info));
     }
-    WebKit::WebMediaStreamDescriptor stream_desc;
+    WebKit::WebMediaStream stream_desc;
     stream_desc.initialize("media stream", audio_sources, video_sources);
 
     return stream_desc;
   }
 
-  void CreateNativeSources(WebKit::WebMediaStreamDescriptor* descriptor) {
+  void CreateNativeSources(WebKit::WebMediaStream* descriptor) {
     MediaSourceCreatedObserver observer;
     WebKit::WebMediaConstraints audio_constraints;
     dependency_factory_->CreateNativeMediaSources(
@@ -120,8 +120,7 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateRTCPeerConnectionHandler) {
 }
 
 TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) {
-  WebKit::WebMediaStreamDescriptor stream_desc = CreateWebKitMediaStream(true,
-                                                                         true);
+  WebKit::WebMediaStream stream_desc = CreateWebKitMediaStream(true, true);
   CreateNativeSources(&stream_desc);
 
   dependency_factory_->CreateNativeLocalMediaStream(&stream_desc);
@@ -138,7 +137,7 @@ TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStream) {
 // remote tracks.
 TEST_F(MediaStreamDependencyFactoryTest, CreateNativeMediaStreamWithoutSource) {
   // Create a WebKit MediaStream description.
-  WebKit::WebMediaStreamDescriptor stream_desc;
+  WebKit::WebMediaStream stream_desc;
   WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources(
       static_cast<size_t>(1));
   audio_sources[0].initialize("audio source",