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

Unified Diff: media/audio/win/audio_output_win_unittest.cc

Issue 8965053: Implement support for a cancelable SyncSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Using a single event for file operations on Windows. Some comment improvements. Created 9 years 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: media/audio/win/audio_output_win_unittest.cc
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 72f078ab0335f7b250f326c41af0cdbca2e5a12c..49159cb4f3e06e1499b64eeaf0b16e41be20b009 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -631,7 +631,6 @@ class SyncSocketSource : public AudioOutputStream::AudioSourceCallback {
: socket_(socket) {}
~SyncSocketSource() {
- delete socket_;
}
// AudioSourceCallback::OnMoreData implementation:
@@ -712,16 +711,16 @@ TEST(WinAudioTest, SyncSocketBasic) {
ASSERT_TRUE(oas->Open());
- base::SyncSocket* sockets[2];
- ASSERT_TRUE(base::SyncSocket::CreatePair(sockets));
+ base::SyncSocket sockets[2];
+ ASSERT_TRUE(base::SyncSocket::CreatePair(&sockets[0], &sockets[1]));
- SyncSocketSource source(sockets[0]);
+ SyncSocketSource source(&sockets[0]);
SyncThreadContext thread_context;
thread_context.sample_rate = sample_rate;
thread_context.sine_freq = 200.0;
thread_context.packet_size_bytes = kSamples20ms * 2;
- thread_context.socket = sockets[1];
+ thread_context.socket = &sockets[1];
HANDLE thread = ::CreateThread(NULL, 0, SyncSocketThread,
&thread_context, 0, NULL);
@@ -730,7 +729,6 @@ TEST(WinAudioTest, SyncSocketBasic) {
::WaitForSingleObject(thread, INFINITE);
::CloseHandle(thread);
- delete sockets[1];
oas->Stop();
oas->Close();
« base/sync_socket_posix.cc ('K') | « media/audio/win/audio_low_latency_output_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698