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

Unified Diff: content/browser/renderer_host/media/mock_media_observer.h

Issue 81953002: Remove MockMediaInternals and incestuous usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix shutdown. Created 7 years, 1 month 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/browser/renderer_host/media/mock_media_observer.h
diff --git a/content/browser/renderer_host/media/mock_media_observer.h b/content/browser/renderer_host/media/mock_media_observer.h
index 5f7fb847b3ce2b78388e4a901c9fc1d999ae7156..c3543f3002b629a2ede11cdd553efe64fe8b40ac 100644
--- a/content/browser/renderer_host/media/mock_media_observer.h
+++ b/content/browser/renderer_host/media/mock_media_observer.h
@@ -8,7 +8,6 @@
#include <string>
#include "base/basictypes.h"
-#include "content/browser/media/media_internals.h"
#include "content/public/browser/media_observer.h"
#include "media/audio/audio_parameters.h"
#include "media/base/media_log_event.h"
@@ -39,27 +38,6 @@ class MockMediaObserver : public MediaObserver {
bool clipped));
};
-class MockMediaInternals : public MediaInternals {
- public:
- MockMediaInternals();
- virtual ~MockMediaInternals();
-
- MOCK_METHOD2(OnDeleteAudioStream,
- void(void* host, int stream_id));
- MOCK_METHOD3(OnSetAudioStreamPlaying,
- void(void* host, int stream_id, bool playing));
- MOCK_METHOD4(OnAudioStreamCreated,
- void(void* host, int stream_id,
- const media::AudioParameters& params,
- const std::string& input_device_id));
- MOCK_METHOD3(OnSetAudioStreamStatus,
- void(void* host, int stream_id, const std::string& status));
- MOCK_METHOD3(OnSetAudioStreamVolume,
- void(void* host, int stream_id, double volume));
- MOCK_METHOD2(OnMediaEvent,
- void(int source, const media::MediaLogEvent& event));
-};
-
} // namespace content
#endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MOCK_MEDIA_OBSERVER_H_

Powered by Google App Engine
This is Rietveld 408576698