Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

webkit/support/test_media_stream_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/support/test_media_stream_client.h"
 
 #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"
 #include "webkit/media/simple_video_frame_provider.h"
 
 using namespace WebKit;
 
 namespace {
 
 static const int kVideoCaptureWidth = 352;
 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;
 }
 
 }  // namespace
 
 namespace webkit_support {
 
 TestMediaStreamClient::TestMediaStreamClient() {}
 
@@ skipping 32 matching lines @@
       gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
       base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs));
 }
 
 scoped_refptr<webkit_media::MediaStreamAudioRenderer>
 TestMediaStreamClient::GetAudioRenderer(const GURL& url) {
   return NULL;
 }
 
 }  // namespace webkit_support