Improve input handling for WaveAudioHandler.

media/audio/sounds/sounds_manager.cc

 // Copyright 2013 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 "media/audio/sounds/sounds_manager.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
@@ skipping 46 matching lines @@
     LOG(WARNING) << "Can't initialize AudioStreamHandler for key=" << key;
     return false;
   }
   handlers_[key] = new_handler;
   return true;
 }
 
 bool SoundsManagerImpl::Play(SoundKey key) {
   DCHECK(CalledOnValidThread());
   linked_ptr<AudioStreamHandler> handler = GetHandler(key);
-  if (!handler.get())
-    return false;
-  if (!handler->IsInitialized())
-    return false;
-  return handler->Play();
+  return handler.get() && handler->IsInitialized() && handler->Play();
 }
 
 bool SoundsManagerImpl::Stop(SoundKey key) {
   DCHECK(CalledOnValidThread());
   linked_ptr<AudioStreamHandler> handler = GetHandler(key);
-  if (!handler.get())
-    return false;
-  if (!handler->IsInitialized())
+  if (!handler.get() || !handler->IsInitialized())
     return false;
   handler->Stop();
   return true;
 }
 
 base::TimeDelta SoundsManagerImpl::GetDuration(SoundKey key) {
   DCHECK(CalledOnValidThread());
   linked_ptr<AudioStreamHandler> handler = GetHandler(key);
-  if (!handler.get())
+  if (!handler.get() || !handler->IsInitialized())
       return base::TimeDelta();
-  if (!handler->IsInitialized())
-    return base::TimeDelta();
-  const WavAudioHandler& wav_audio = handler->wav_audio_handler();
-  return wav_audio.GetDuration();
+  return handler->duration();
 }
 
 linked_ptr<AudioStreamHandler> SoundsManagerImpl::GetHandler(SoundKey key) {
   auto key_handler_pair_iter = handlers_.find(key);
   return key_handler_pair_iter == handlers_.end() ?
       linked_ptr<AudioStreamHandler>() : key_handler_pair_iter->second;
 }
 
 }  // namespace
 
@@ skipping 26 matching lines @@
 
 // static
 void SoundsManager::InitializeForTesting(SoundsManager* manager) {
   CHECK(!g_instance) << "SoundsManager is already initialized.";
   CHECK(manager);
   g_instance = manager;
   g_initialized_for_testing = true;
 }
 
 }  // namespace media