Makes AudioOutputProxy -> AudioOutputDispatcher reference weak.

media/audio/audio_output_proxy_unittest.cc

Index: media/audio/audio_output_proxy_unittest.cc
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 9900eb18341f9acd04b45002a370d8815f7b0b44..b7219f8746b2fda5f016b30599058190d7558124 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -211,7 +211,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, Open())
         .WillOnce(Return(true));
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy->Open());
     CloseAndWaitForCloseTimer(proxy, &stream);
   }
@@ -227,7 +227,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, SetVolume(_))
         .Times(1);
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy->Open());
 
     proxy->Start(&callback_);
@@ -250,7 +250,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, SetVolume(_))
         .Times(1);
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy->Open());
 
     proxy->Start(&callback_);
@@ -273,8 +273,8 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, Open())
         .WillOnce(Return(true));
 
-    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher);
-    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher->AsWeakPtr());
+    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy1->Open());
     EXPECT_TRUE(proxy2->Open());
     proxy1->Close();
@@ -294,7 +294,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, Close())
         .Times(1);
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_FALSE(proxy->Open());
     proxy->Close();
     EXPECT_FALSE(stream.stop_called());
@@ -309,7 +309,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, Open())
         .WillOnce(Return(true));
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy->Open());
 
     WaitForCloseTimer(&stream);
@@ -329,7 +329,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, SetVolume(_))
         .Times(2);
 
-    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy1->Open());
 
     proxy1->Start(&callback_);
@@ -337,7 +337,7 @@ class AudioOutputProxyTest : public testing::Test {
     proxy1->Stop();
 
     // The stream should now be idle and get reused by |proxy2|.
-    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy2->Open());
     proxy2->Start(&callback_);
     OnStart();
@@ -367,8 +367,8 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream2, SetVolume(_))
         .Times(1);
 
-    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher);
-    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy1 = new AudioOutputProxy(dispatcher->AsWeakPtr());
+    AudioOutputProxy* proxy2 = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy1->Open());
     EXPECT_TRUE(proxy2->Open());
 
@@ -395,7 +395,7 @@ class AudioOutputProxyTest : public testing::Test {
     EXPECT_CALL(stream, Open())
         .WillOnce(Return(true));
 
-    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher);
+    AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher->AsWeakPtr());
     EXPECT_TRUE(proxy->Open());
 
     WaitForCloseTimer(&stream);
@@ -457,12 +457,12 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest {
 };
 
 TEST_F(AudioOutputProxyTest, CreateAndClose) {
-  AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_impl_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_impl_->AsWeakPtr());
   proxy->Close();
 }
 
 TEST_F(AudioOutputResamplerTest, CreateAndClose) {
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   proxy->Close();
 }
 
@@ -553,7 +553,7 @@ TEST_F(AudioOutputResamplerTest, LowLatencyCreateFailedFallback) {
   EXPECT_CALL(stream, Open())
       .WillOnce(Return(true));
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &stream);
 }
@@ -574,7 +574,7 @@ TEST_F(AudioOutputResamplerTest, LowLatencyOpenFailedFallback) {
   EXPECT_CALL(okay_stream, Open())
       .WillOnce(Return(true));
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &okay_stream);
 }
@@ -611,7 +611,7 @@ TEST_F(AudioOutputResamplerTest, HighLatencyFallbackFailed) {
   EXPECT_CALL(okay_stream, Open())
       .WillOnce(Return(true));
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &okay_stream);
 }
@@ -631,7 +631,7 @@ TEST_F(AudioOutputResamplerTest, AllFallbackFailed) {
       .Times(kFallbackCount)
       .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_FALSE(proxy->Open());
   proxy->Close();
 }
@@ -661,19 +661,19 @@ TEST_F(AudioOutputResamplerTest, LowLatencyOpenEventuallyFails) {
       .Times(1);
 
   // Open and start the first proxy and stream.
-  AudioOutputProxy* proxy1 = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy1 = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy1->Open());
   proxy1->Start(&callback_);
   OnStart();
 
   // Open and start the second proxy and stream.
-  AudioOutputProxy* proxy2 = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy2 = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy2->Open());
   proxy2->Start(&callback_);
   OnStart();
 
   // Attempt to open the third stream which should fail.
-  AudioOutputProxy* proxy3 = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy3 = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_FALSE(proxy3->Open());
   proxy3->Close();
 
@@ -719,7 +719,7 @@ TEST_F(AudioOutputResamplerTest, FallbackRecovery) {
                   _, _))
       .WillOnce(Return(&fake_stream));
   EXPECT_CALL(fake_stream, Open()).WillOnce(Return(true));
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &fake_stream);
 
@@ -742,7 +742,7 @@ TEST_F(AudioOutputResamplerTest, FallbackRecovery) {
 
   // Stream1 should be able to successfully open and start.
   EXPECT_CALL(real_stream, Open()).WillOnce(Return(true));
-  proxy = new AudioOutputProxy(resampler_.get());
+  proxy = new AudioOutputProxy(resampler_->AsWeakPtr());
   EXPECT_TRUE(proxy->Open());
   CloseAndWaitForCloseTimer(proxy, &real_stream);
 }