Fix a couple of regressions that made it in before the weekend.

content/browser/renderer_host/media/audio_renderer_host.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/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 311 matching lines @@
        i != audio_entries_.end(); ++i) {
     CloseAndDeleteStream(i->second);
   }
 }
 
 void AudioRendererHost::CloseAndDeleteStream(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!entry->pending_close) {
     entry->controller->Close(
-        base::Bind(&AudioRendererHost::OnStreamClosed, this, entry));
+        base::Bind(&AudioRendererHost::DeleteEntry, this, entry));
     entry->pending_close = true;
   }
 }
 
-void AudioRendererHost::OnStreamClosed(AudioEntry* entry) {
-  // Delete the entry on the IO thread after we've closed the stream.
-  // (We're currently on the audio thread).
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&AudioRendererHost::DeleteEntry, this, entry));
-}
-
 void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Delete the entry when this method goes out of scope.
   scoped_ptr<AudioEntry> entry_deleter(entry);
 
   // Erase the entry identified by |stream_id| from the map.
   audio_entries_.erase(entry->stream_id);
 
   // Notify the media observer.
@@ skipping 28 matching lines @@
 
   // Iterate the map of entries.
   // TODO(hclam): Implement a faster look up method.
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     if (!i->second->pending_close && controller == i->second->controller.get())
       return i->second;
   }
   return NULL;
 }