Switch back to 'int' instead of uint32 and call CancelIo before closing the socket handle.

content/renderer/media/audio_device.cc

 // Copyright (c) 2012 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 "content/renderer/media/audio_device.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 260 matching lines @@
   audio_thread_->SetThreadPriority(base::kThreadPriority_RealtimeAudio);
 
   base::SharedMemory shared_memory(shared_memory_handle_, false);
   shared_memory.Map(media::TotalSharedMemorySizeInBytes(memory_length_));
   base::CancelableSyncSocket* audio_socket = audio_socket_.get();
 
   const int samples_per_ms = static_cast<int>(sample_rate_) / 1000;
   const int bytes_per_ms = channels_ * (bits_per_sample_ / 8) * samples_per_ms;
 
   while (true) {
-    uint32 pending_data = 0;
+    int pending_data = 0;
     size_t bytes_read = audio_socket->Receive(&pending_data,
                                               sizeof(pending_data));
     if (bytes_read != sizeof(pending_data)) {
       DCHECK_EQ(bytes_read, 0U);
       break;
     }
 
-    if (pending_data ==
-        static_cast<uint32>(media::AudioOutputController::kPauseMark)) {
+    if (pending_data == media::AudioOutputController::kPauseMark) {
       memset(shared_memory.memory(), 0, memory_length_);
       media::SetActualDataSizeInBytes(&shared_memory, memory_length_, 0);
       continue;
     }
 
     // Convert the number of pending bytes in the render buffer
     // into milliseconds.
     audio_delay_milliseconds_ = pending_data / bytes_per_ms;
     size_t num_frames = FireRenderCallback(
         reinterpret_cast<int16*>(shared_memory.memory()));
@@ skipping 33 matching lines @@
     // Close the socket to terminate the main thread function in the
     // audio thread.
     audio_socket_->Shutdown();  // Stops blocking Receive calls.
     // TODO(tommi): We must not do this from the IO thread.  Fix.
     base::ThreadRestrictions::ScopedAllowIO allow_wait;
     audio_thread_->Join();
     audio_thread_.reset(NULL);
     audio_socket_.reset();
   }
 }