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

Unified Diff: media/audio/audio_output_proxy_unittest.cc

Issue 9965076: Revert 130180 - Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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
« no previous file with comments | « media/audio/audio_output_proxy.cc ('k') | media/audio/audio_parameters.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_proxy_unittest.cc
===================================================================
--- media/audio/audio_output_proxy_unittest.cc (revision 130181)
+++ media/audio/audio_output_proxy_unittest.cc (working copy)
@@ -14,16 +14,7 @@
using ::testing::_;
using ::testing::Mock;
using ::testing::Return;
-using media::AudioBuffersState;
-using media::AudioInputStream;
-using media::AudioManager;
-using media::AudioOutputDispatcher;
-using media::AudioOutputProxy;
-using media::AudioOutputStream;
-using media::AudioParameters;
-namespace {
-
static const int kTestCloseDelayMs = 100;
// Used in the test where we don't want a stream to be closed unexpectedly.
@@ -74,10 +65,6 @@
MOCK_METHOD2(OnError, void(AudioOutputStream* stream, int code));
};
-} // namespace
-
-namespace media {
-
class AudioOutputProxyTest : public testing::Test {
protected:
virtual void SetUp() {
@@ -384,5 +371,3 @@
proxy->Close();
}
-
-} // namespace media
« no previous file with comments | « media/audio/audio_output_proxy.cc ('k') | media/audio/audio_parameters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698