Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/media_stream_extra_data.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
-#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamDescriptor.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
 
 namespace webrtc {
 class MediaStreamInterface;
 class LocalMediaStreamInterface;
 }  // namespace webrtc
 
 namespace content {
 
 class CONTENT_EXPORT MediaStreamExtraData
-    : NON_EXPORTED_BASE(public WebKit::WebMediaStreamDescriptor::ExtraData) {
+    : NON_EXPORTED_BASE(public WebKit::WebMediaStream::ExtraData) {
  public:
   typedef base::Callback<void(const std::string& label)> StreamStopCallback;
 
   explicit MediaStreamExtraData(webrtc::MediaStreamInterface* remote_stream);
   explicit MediaStreamExtraData(
       webrtc::LocalMediaStreamInterface* local_stream);
   virtual ~MediaStreamExtraData();
 
   void SetLocalStreamStopCallback(
       const StreamStopCallback& stop_callback);
   void OnLocalStreamStop();
 
   webrtc::MediaStreamInterface* remote_stream() { return remote_stream_.get(); }
   webrtc::LocalMediaStreamInterface* local_stream() {
     return local_stream_.get();
   }
 
  private:
   StreamStopCallback stream_stop_callback_;
   scoped_refptr<webrtc::MediaStreamInterface> remote_stream_;
   scoped_refptr<webrtc::LocalMediaStreamInterface> local_stream_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamExtraData);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_EXTRA_DATA_H_