Renamed WebMediaStreamComponent and WebMediaStreamDescriptor to WebMediaStreamTrack & WebMediaStream

content/renderer/media/rtc_peer_connection_handler.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_RTC_PEER_CONNECTION_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
@@ skipping 34 matching lines @@
 
 // Mockable wrapper for WebKit::WebRTCStatsRequest
 class CONTENT_EXPORT LocalRTCStatsRequest
     : public talk_base::RefCountInterface {
  public:
   explicit LocalRTCStatsRequest(WebKit::WebRTCStatsRequest impl);
   // Constructor for testing.
   LocalRTCStatsRequest();
 
   virtual bool hasSelector() const;
-  virtual WebKit::WebMediaStreamDescriptor stream() const;
-  virtual WebKit::WebMediaStreamComponent component() const;
+  virtual WebKit::WebMediaStream stream() const;
+  virtual WebKit::WebMediaStreamTrack component() const;
   virtual void requestSucceeded(const LocalRTCStatsResponse* response);
   virtual scoped_refptr<LocalRTCStatsResponse> createResponse();
 
  protected:
   virtual ~LocalRTCStatsRequest();
 
  private:
   WebKit::WebRTCStatsRequest impl_;
   talk_base::scoped_refptr<LocalRTCStatsResponse> response_;
 };
@@ skipping 43 matching lines @@
       OVERRIDE;
   virtual WebKit::WebRTCSessionDescription remoteDescription()
       OVERRIDE;
   virtual bool updateICE(
       const WebKit::WebRTCConfiguration& server_configuration,
       const WebKit::WebMediaConstraints& options) OVERRIDE;
   virtual bool addICECandidate(
       const WebKit::WebRTCICECandidate& candidate) OVERRIDE;
 
   virtual bool addStream(
-      const WebKit::WebMediaStreamDescriptor& stream,
+      const WebKit::WebMediaStream& stream,
       const WebKit::WebMediaConstraints& options) OVERRIDE;
   virtual void removeStream(
-      const WebKit::WebMediaStreamDescriptor& stream) OVERRIDE;
+      const WebKit::WebMediaStream& stream) OVERRIDE;
   virtual void getStats(
       const WebKit::WebRTCStatsRequest& request) OVERRIDE;
   virtual WebKit::WebRTCDataChannelHandler* createDataChannel(
       const WebKit::WebString& label, bool reliable) OVERRIDE;
   virtual void stop() OVERRIDE;
 
   // webrtc::PeerConnectionObserver implementation
   virtual void OnError() OVERRIDE;
   virtual void OnStateChange(StateType state_changed) OVERRIDE;
   virtual void OnAddStream(webrtc::MediaStreamInterface* stream) OVERRIDE;
@@ skipping 17 matching lines @@
   WebKit::WebRTCPeerConnectionHandlerClient* client_;
 
   WebKit::WebFrame* frame_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_