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

media/audio/audio_input_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_INPUT_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_
 
 #include <string>
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 37 matching lines @@
 //                    DoResetNoDataTimer (posted on creating tread)
 //                                  .------------------------->  OnCreated()
 //                               kCreated
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Record() ==>                 DoRecord()
 //                    AudioInputStream::Start()
 //                                  .------------------------->  OnRecording()
 //                              kRecording
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // Close() ==>                  DoClose()
+//                              state_ = kClosed
 //                    AudioInputStream::Stop()
 //                    AudioInputStream::Close()
 //                    SyncWriter::Close()
-//                    Closure::Run()
-// (closure-task) <----------------.
-//                              kClosed
+// Closure::Run() <--------------.
+// (closure-task)
 //
 // The audio thread itself is owned by the AudioManager that the
 // AudioInputController holds a reference to.  When performing tasks on the
 // audio thread, the controller must not add or release references to the
 // AudioManager or itself (since it in turn holds a reference to the manager).
 //
 namespace media {
 
 class MEDIA_EXPORT AudioInputController
     : public base::RefCountedThreadSafe<AudioInputController>,
@@ skipping 154 matching lines @@
   SyncWriter* sync_writer_;
 
   static Factory* factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioInputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_INPUT_CONTROLLER_H_