summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 16:09:05 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 16:09:05 +0000
commit967cbe1640bf96583e74cbd3ae4cd3a2a7cf3116 (patch)
tree2c240a71bdbae4ba40c909f9be5d3177cb55560c
parent1b26acac5336daf376ab74303d6e22a648415c3d (diff)
downloadchromium_src-967cbe1640bf96583e74cbd3ae4cd3a2a7cf3116.zip
chromium_src-967cbe1640bf96583e74cbd3ae4cd3a2a7cf3116.tar.gz
chromium_src-967cbe1640bf96583e74cbd3ae4cd3a2a7cf3116.tar.bz2
Remove a test which checks for timing of audio recording callbacks.
This frequently fails in various builders because the machines may be overloaded when the tests run, so I see no point in such a timing test. BUG=49497 TEST=none Review URL: http://codereview.chromium.org/6673022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77819 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/audio/fake_audio_input_stream_unittest.cc50
-rw-r--r--media/media.gyp1
2 files changed, 0 insertions, 51 deletions
diff --git a/media/audio/fake_audio_input_stream_unittest.cc b/media/audio/fake_audio_input_stream_unittest.cc
deleted file mode 100644
index ff3b6f5..0000000
--- a/media/audio/fake_audio_input_stream_unittest.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "base/basictypes.h"
-#include "base/threading/platform_thread.h"
-#include "media/audio/audio_io.h"
-#include "media/audio/audio_manager.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-using ::testing::_;
-using ::testing::AtLeast;
-using ::testing::Exactly;
-using ::testing::NotNull;
-
-class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
- public:
- MockAudioInputCallback() {}
-
- MOCK_METHOD1(OnClose, void(AudioInputStream* stream));
- MOCK_METHOD2(OnError, void(AudioInputStream* stream, int error_code));
- MOCK_METHOD3(OnData, void(AudioInputStream* stream, const uint8* src,
- uint32 size));
- private:
- DISALLOW_COPY_AND_ASSIGN(MockAudioInputCallback);
-};
-
-// ============================================================================
-// Validate that the AudioManager::AUDIO_MOCK callbacks work.
-// Crashes, http://crbug.com/49497.
-TEST(FakeAudioInputTest, DISABLED_BasicCallbacks) {
- MockAudioInputCallback callback;
- EXPECT_CALL(callback, OnData(NotNull(), _, _)).Times(AtLeast(5));
- EXPECT_CALL(callback, OnError(NotNull(), _)).Times(Exactly(0));
-
- AudioManager* audio_man = AudioManager::GetAudioManager();
- ASSERT_TRUE(NULL != audio_man);
- // Ask for one recorded packet every 50ms.
- AudioInputStream* stream = audio_man->MakeAudioInputStream(
- AudioParameters(AudioParameters::AUDIO_MOCK, 2, 8000, 8, 400));
- ASSERT_TRUE(NULL != stream);
- EXPECT_TRUE(stream->Open());
- stream->Start(&callback);
-
- // Give sufficient time to receive 5 / 6 packets.
- base::PlatformThread::Sleep(340);
- stream->Stop();
- stream->Close();
-}
diff --git a/media/media.gyp b/media/media.gyp
index 23307e0..48d9e4d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -341,7 +341,6 @@
'audio/audio_output_proxy_unittest.cc',
'audio/audio_parameters_unittest.cc',
'audio/audio_util_unittest.cc',
- 'audio/fake_audio_input_stream_unittest.cc',
'audio/linux/alsa_output_unittest.cc',
'audio/mac/audio_output_mac_unittest.cc',
'audio/simple_sources_unittest.cc',