diff options
| author | tommyw@chromium.org <tommyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 12:07:17 +0000 |
|---|---|---|
| committer | tommyw@chromium.org <tommyw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-04 12:07:17 +0000 |
| commit | 56e975eada25f5a4b9ca835a1b16d6876d51a1de (patch) | |
| tree | 98cc1fc6ac3a7e51449b86a1e1c6418cf29f5aca /webkit | |
| parent | e0203c0032973f7b029f6109d8e50e8655e5851d (diff) | |
| download | chromium_src-56e975eada25f5a4b9ca835a1b16d6876d51a1de.zip chromium_src-56e975eada25f5a4b9ca835a1b16d6876d51a1de.tar.gz chromium_src-56e975eada25f5a4b9ca835a1b16d6876d51a1de.tar.bz2 | |
Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream
Depends on a not yet landed WebKit patch
BUG=173105
Review URL: https://chromiumcodereview.appspot.com/12084088
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/test_media_stream_client.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc index 2b55dc3..69df55a 100644 --- a/webkit/support/test_media_stream_client.cc +++ b/webkit/support/test_media_stream_client.cc @@ -7,8 +7,8 @@ #include "googleurl/src/gurl.h" #include "media/base/pipeline.h" #include "media/filters/video_frame_generator.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/WebMediaStreamTrack.h" #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h" #include "webkit/media/media_stream_audio_renderer.h" @@ -23,11 +23,11 @@ static const int kVideoCaptureHeight = 288; static const int kVideoCaptureFrameDurationMs = 33; bool IsMockMediaStreamWithVideo(const WebURL& url) { - WebMediaStreamDescriptor descriptor( + WebMediaStream descriptor( WebMediaStreamRegistry::lookupMediaStreamDescriptor(url)); if (descriptor.isNull()) return false; - WebVector<WebMediaStreamComponent> videoSources; + WebVector<WebMediaStreamTrack> videoSources; descriptor.videoSources(videoSources); return videoSources.size() > 0; } |