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

media/audio/audio_output_controller.h

 // 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 166 matching lines @@
 
   AudioOutputController(EventHandler* handler,
                         SyncReader* sync_reader);
 
   // The following methods are executed on the audio manager thread.
   void DoCreate(AudioManager* audio_manager, const AudioParameters& params);
   void DoPlay();
   void PollAndStartIfDataReady();
   void DoPause();
   void DoFlush();
-  void DoClose(const base::Closure& closed_task);
+  void DoClose();
   void DoSetVolume(double volume);
   void DoReportError(int code);
 
   // Helper method that starts physical stream.
   void StartStream();
 
   // Helper method that stops, closes, and NULLs |*stream_|.
   // Signals event when done if it is not NULL.
   void DoStopCloseAndClearStream(base::WaitableEvent *done);
 
@@ skipping 28 matching lines @@
   // shutdown and force it to wait for the most delayed task.
   // Also, if we're shutting down, we do not want to poll for more data.
   base::WeakPtrFactory<AudioOutputController> weak_this_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_