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

content/browser/renderer_host/media/audio_input_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_input_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 356 matching lines @@
   audio_input_man->Stop(session_id);
 
   // Delete the session entry.
   session_entries_.erase(session_id);
 }
 
 void AudioInputRendererHost::CloseAndDeleteStream(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   if (!entry->pending_close) {
-    entry->controller->Close(base::Bind(&AudioInputRendererHost::OnStreamClosed,
+    entry->controller->Close(base::Bind(&AudioInputRendererHost::DeleteEntry,
                                         this, entry));
     entry->pending_close = true;
   }
 }
 
-void AudioInputRendererHost::OnStreamClosed(AudioEntry* entry) {
-  // We should be on the the audio-manager thread now.
-  DCHECK(entry->controller->message_loop()->BelongsToCurrentThread());
-
-  // Delete the entry after we've closed the stream.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::Bind(&AudioInputRendererHost::DeleteEntry, this, entry));
-}
-
 void AudioInputRendererHost::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 from the map.
   audio_entries_.erase(entry->stream_id);
 }
 
@@ skipping 34 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (SessionEntryMap::iterator it = session_entries_.begin();
        it != session_entries_.end(); ++it) {
     if (stream_id == it->second) {
       return it->first;
     }
   }
   return 0;
 }