Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(50)

Unified Diff: content/renderer/media/mock_media_stream_dispatcher.h

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_media_stream_dispatcher.h
===================================================================
--- content/renderer/media/mock_media_stream_dispatcher.h (revision 164646)
+++ content/renderer/media/mock_media_stream_dispatcher.h (working copy)
@@ -21,7 +21,7 @@
virtual void GenerateStream(
int request_id,
const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
- const media_stream::StreamOptions& components,
+ const StreamOptions& components,
const GURL& url) OVERRIDE;
virtual void StopStream(const std::string& label) OVERRIDE;
virtual bool IsStream(const std::string& label) OVERRIDE;
@@ -32,12 +32,8 @@
int request_stream_counter() const { return request_stream_counter_; }
int stop_stream_counter() const { return stop_stream_counter_; }
const std::string& stream_label() const { return stream_label_;}
- media_stream::StreamDeviceInfoArray audio_array() const {
- return audio_array_;
- }
- media_stream::StreamDeviceInfoArray video_array() const {
- return video_array_;
- }
+ StreamDeviceInfoArray audio_array() const { return audio_array_; }
+ StreamDeviceInfoArray video_array() const { return video_array_; }
private:
int request_id_;
@@ -46,8 +42,8 @@
int stop_stream_counter_;
std::string stream_label_;
- media_stream::StreamDeviceInfoArray audio_array_;
- media_stream::StreamDeviceInfoArray video_array_;
+ StreamDeviceInfoArray audio_array_;
+ StreamDeviceInfoArray video_array_;
DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcher);
};

Powered by Google App Engine
This is Rietveld 408576698