Redesign the copresence audio handlers.

components/copresence/mediums/audio/audio_player_unittest.cc

 // Copyright 2014 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 "components/copresence/mediums/audio/audio_player.h"
 
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
+#include "components/copresence/mediums/audio/audio_player_impl.h"
 #include "components/copresence/public/copresence_constants.h"
 #include "components/copresence/test/audio_test_support.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/base/audio_bus.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class TestAudioOutputStream : public media::AudioOutputStream {
@@ skipping 55 matching lines @@
  public:
   AudioPlayerTest() : buffer_index_(0), player_(NULL) {
     if (!media::AudioManager::Get())
       media::AudioManager::CreateForTesting();
   }
 
   virtual ~AudioPlayerTest() { DeletePlayer(); }
 
   void CreatePlayer() {
     DeletePlayer();
-    player_ = new AudioPlayer();
+    player_ = new AudioPlayerImpl();
     player_->set_output_stream_for_testing(new TestAudioOutputStream(
         kDefaultFrameCount,
         kMaxFrameCount,
         base::Bind(&AudioPlayerTest::GatherSamples, AsWeakPtr())));
     player_->Initialize();
   }
 
   void DeletePlayer() {
     if (!player_)
       return;
@@ skipping 27 matching lines @@
     player_->FlushAudioLoopForTesting();
     return player_->is_playing_;
   }
 
   static const int kDefaultFrameCount = 1024;
   static const int kMaxFrameCount = 1024 * 10;
 
   scoped_ptr<media::AudioBus> buffer_;
   int buffer_index_;
 
-  AudioPlayer* player_;
+  // Deleted by calling Finalize() on the object.
+  AudioPlayerImpl* player_;
   base::MessageLoop message_loop_;
 };
 
 TEST_F(AudioPlayerTest, BasicPlayAndStop) {
   CreatePlayer();
   scoped_refptr<media::AudioBusRefCounted> samples =
       media::AudioBusRefCounted::Create(1, 7331);
 
   player_->Play(samples);
   EXPECT_TRUE(IsPlaying());
@@ skipping 37 matching lines @@
 TEST_F(AudioPlayerTest, PlayingEndToEnd) {
   const int kNumSamples = kDefaultFrameCount * 10;
   CreatePlayer();
 
   PlayAndVerifySamples(CreateRandomAudioRefCounted(0x1337, 1, kNumSamples));
 
   DeletePlayer();
 }
 
 }  // namespace copresence