Remove the AudioManager singleton.

media/audio/linux/alsa_output_unittest.cc

Index: media/audio/linux/alsa_output_unittest.cc
===================================================================
--- media/audio/linux/alsa_output_unittest.cc	(revision 113173)
+++ media/audio/linux/alsa_output_unittest.cc	(working copy)
@@ -91,6 +91,7 @@
 class AlsaPcmOutputStreamTest : public testing::Test {
  protected:
   AlsaPcmOutputStreamTest() {
+    mock_manager_ = new StrictMock<MockAudioManagerLinux>();
     test_stream_.reset(CreateStream(kTestChannelLayout));
   }
 
@@ -109,7 +110,7 @@
     return new AlsaPcmOutputStream(kTestDeviceName,
                                    params,
                                    &mock_alsa_wrapper_,
-                                   &mock_manager_,
+                                   mock_manager_.get(),

[scherkus (not reviewing), 2011/12/09 22:47:30]

.get() here and below

[tommi (sloooow) - chröme, 2011/12/10 00:11:14]

Done.

                                    &message_loop_);
   }
 
@@ -132,6 +133,10 @@
     test_stream_->buffer_->Append(packet_.get());
   }
 
+  MockAudioManagerLinux& mock_manager() {
+    return *mock_manager_.get();
+  }
+
   static const ChannelLayout kTestChannelLayout;
   static const int kTestSampleRate;
   static const int kTestBitsPerSample;
@@ -154,7 +159,7 @@
   static void* kFakeHints[];
 
   StrictMock<MockAlsaWrapper> mock_alsa_wrapper_;
-  StrictMock<MockAudioManagerLinux> mock_manager_;
+  scoped_refptr<StrictMock<MockAudioManagerLinux> > mock_manager_;
   MessageLoop message_loop_;
   scoped_ptr<AlsaPcmOutputStream> test_stream_;
   scoped_refptr<media::DataBuffer> packet_;
@@ -211,7 +216,7 @@
   test_stream_.reset(new AlsaPcmOutputStream(kTestDeviceName,
                                              bad_bps_params,
                                              &mock_alsa_wrapper_,
-                                             &mock_manager_,
+                                             mock_manager_.get(),
                                              &message_loop_));
   EXPECT_EQ(AlsaPcmOutputStream::kInError, test_stream_->state());
 
@@ -222,7 +227,7 @@
   test_stream_.reset(new AlsaPcmOutputStream(kTestDeviceName,
                                              bad_format_params,
                                              &mock_alsa_wrapper_,
-                                             &mock_manager_,
+                                             mock_manager_.get(),
                                              &message_loop_));
   EXPECT_EQ(AlsaPcmOutputStream::kInError, test_stream_->state());
 }
@@ -257,12 +262,12 @@
   EXPECT_CALL(mock_alsa_wrapper_, PcmClose(kFakeHandle)).WillOnce(Return(0));
   EXPECT_CALL(mock_alsa_wrapper_, PcmName(kFakeHandle))
       .WillOnce(Return(kTestDeviceName));
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   test_stream_->Close();
   message_loop_.RunAllPending();
 
   Mock::VerifyAndClear(&mock_alsa_wrapper_);
-  Mock::VerifyAndClear(&mock_manager_);
+  Mock::VerifyAndClear(mock_manager_.get());
 
   // Test that having more packets ends up with a latency based on packet size.
   const int kOverMinLatencyPacketSize = kPacketFramesInMinLatency + 1;
@@ -289,12 +294,12 @@
       .WillOnce(Return(0));
   EXPECT_CALL(mock_alsa_wrapper_, PcmName(kFakeHandle))
       .WillOnce(Return(kTestDeviceName));
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   test_stream_->Close();
   message_loop_.RunAllPending();
 
   Mock::VerifyAndClear(&mock_alsa_wrapper_);
-  Mock::VerifyAndClear(&mock_manager_);
+  Mock::VerifyAndClear(mock_manager_.get());
 }
 
 TEST_F(AlsaPcmOutputStreamTest, OpenClose) {
@@ -339,7 +344,7 @@
       .WillOnce(Return(0));
   EXPECT_CALL(mock_alsa_wrapper_, PcmName(kFakeHandle))
       .WillOnce(Return(kTestDeviceName));
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   test_stream_->Close();
   message_loop_.RunAllPending();
 
@@ -367,7 +372,7 @@
   EXPECT_FALSE(test_stream_->buffer_.get());
 
   // Close the stream since we opened it to make destruction happy.
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   test_stream_->Close();
   message_loop_.RunAllPending();
 }
@@ -399,7 +404,7 @@
   EXPECT_FALSE(test_stream_->buffer_.get());
 
   // Close the stream since we opened it to make destruction happy.
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   test_stream_->Close();
   message_loop_.RunAllPending();
 }
@@ -456,7 +461,7 @@
   test_stream_->Start(&mock_callback);
   message_loop_.RunAllPending();
 
-  EXPECT_CALL(mock_manager_, ReleaseOutputStream(test_stream_.get()));
+  EXPECT_CALL(mock_manager(), ReleaseOutputStream(test_stream_.get()));
   EXPECT_CALL(mock_alsa_wrapper_, PcmClose(kFakeHandle))
       .WillOnce(Return(0));
   EXPECT_CALL(mock_alsa_wrapper_, PcmName(kFakeHandle))
@@ -685,7 +690,7 @@
     EXPECT_EQ(kExpectedDownmix[i], test_stream_->should_downmix_);
 
     Mock::VerifyAndClearExpectations(&mock_alsa_wrapper_);
-    Mock::VerifyAndClearExpectations(&mock_manager_);
+    Mock::VerifyAndClearExpectations(mock_manager_.get());
   }
 }