| Index: content/renderer/media/mock_media_stream_dispatcher.h | 
| =================================================================== | 
| --- content/renderer/media/mock_media_stream_dispatcher.h	(revision 278172) | 
| +++ content/renderer/media/mock_media_stream_dispatcher.h	(working copy) | 
| @@ -27,18 +27,12 @@ | 
| int request_id, | 
| const base::WeakPtr<MediaStreamDispatcherEventHandler>& | 
| event_handler) OVERRIDE; | 
| -  virtual void EnumerateDevices( | 
| -      int request_id, | 
| -      const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler, | 
| -      MediaStreamType type, | 
| -      const GURL& security_origin) OVERRIDE; | 
| virtual void StopStreamDevice(const StreamDeviceInfo& device_info) OVERRIDE; | 
| virtual bool IsStream(const std::string& label) OVERRIDE; | 
| virtual int video_session_id(const std::string& label, int index) OVERRIDE; | 
| virtual int audio_session_id(const std::string& label, int index) OVERRIDE; | 
|  | 
| -  int audio_request_id() const { return audio_request_id_; } | 
| -  int video_request_id() const { return video_request_id_; } | 
| +  int request_id() const { return request_id_; } | 
| int request_stream_counter() const { return request_stream_counter_; } | 
| void IncrementSessionId() { ++session_id_; } | 
|  | 
| @@ -50,11 +44,7 @@ | 
| StreamDeviceInfoArray video_array() const { return video_array_; } | 
|  | 
| private: | 
| -  void AddAudioDeviceToArray(); | 
| -  void AddVideoDeviceToArray(); | 
| - | 
| -  int audio_request_id_; | 
| -  int video_request_id_;  // Only used for EnumerateDevices. | 
| +  int request_id_; | 
| base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_; | 
| int request_stream_counter_; | 
| int stop_audio_device_counter_; | 
|  |