Revert 35837 - Failed media tests - linux: grab device name before closing it...

media/audio/linux/alsa_output.cc

 // Copyright (c) 2009 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.
 //
 // THREAD SAFETY
 //
 // The AlsaPcmOutputStream object's internal state is accessed by two threads:
 //
 //   client thread - creates the object and calls the public APIs.
 //   message loop thread - executes all the internal tasks including querying
@@ skipping 738 matching lines @@
       // TODO(ajwong): Retry on certain errors?
       LOG(WARNING) << "Unable to close audio device. Leaking handle.";
     }
     return NULL;
   }
 
   return handle;
 }
 
 bool AlsaPcmOutputStream::CloseDevice(snd_pcm_t* handle) {
-  std::string name = wrapper_->PcmName(handle);
   int error = wrapper_->PcmClose(handle);
   if (error < 0) {
-    LOG(ERROR) << "Error closing audio device (" << name << "): "
-               << wrapper_->StrError(error);
+    LOG(ERROR) << "Cannot close audio device (" << wrapper_->PcmName(handle)
+               << "): " << wrapper_->StrError(error);
     return false;
   }
 
   return true;
 }
 
 snd_pcm_sframes_t AlsaPcmOutputStream::GetAvailableFrames() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
 
   if (stop_stream_) {
@@ skipping 175 matching lines @@
 }
 
 // Changes the AudioSourceCallback to proxy calls to.  Pass in NULL to
 // release ownership of the currently registered callback.
 void AlsaPcmOutputStream::SharedData::set_source_callback(
     AudioSourceCallback* callback) {
   DCHECK_EQ(MessageLoop::current(), state_transition_loop_);
   AutoLock l(lock_);
   source_callback_ = callback;
 }