Update media/ to use scoped_refptr<T>::get() rather than implicit "operator T*"

Linux fixes

BUG=110610
TBR=darin

Review URL: https://chromiumcodereview.appspot.com/16297002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203650 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 53 insertions, 61 deletions

diff --git a/media/audio/audio_device_thread.cc b/media/audio/audio_device_thread.cc
index f68c045..6f92f67 100644
--- a/media/audio/audio_device_thread.cc
+++ b/media/audio/audio_device_thread.cc
@@ -64,22 +64,20 @@ class AudioDeviceThread::Thread
 AudioDeviceThread::AudioDeviceThread() {
 }
 
-AudioDeviceThread::~AudioDeviceThread() {
-  DCHECK(!thread_);
-}
+AudioDeviceThread::~AudioDeviceThread() { DCHECK(!thread_.get()); }
 
 void AudioDeviceThread::Start(AudioDeviceThread::Callback* callback,
                               base::SyncSocket::Handle socket,
                               const char* thread_name) {
   base::AutoLock auto_lock(thread_lock_);
-  CHECK(thread_ == NULL);
+  CHECK(thread_.get() == NULL);
   thread_ = new AudioDeviceThread::Thread(callback, socket, thread_name);
   thread_->Start();
 }
 
 void AudioDeviceThread::Stop(base::MessageLoop* loop_for_join) {
   base::AutoLock auto_lock(thread_lock_);
-  if (thread_) {
+  if (thread_.get()) {
     thread_->Stop(loop_for_join);
     thread_ = NULL;
   }
@@ -87,7 +85,7 @@ void AudioDeviceThread::Stop(base::MessageLoop* loop_for_join) {
 
 bool AudioDeviceThread::IsStopped() {
   base::AutoLock auto_lock(thread_lock_);
-  return thread_ == NULL;
+  return thread_.get() == NULL;
 }
 
 // AudioDeviceThread::Thread implementation
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index d70c706..dd8ab7c 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -44,7 +44,7 @@ AudioInputController::AudioInputController(EventHandler* handler,
       state_(kEmpty),
       sync_writer_(sync_writer),
       max_volume_(0.0) {
-  DCHECK(creator_loop_);
+  DCHECK(creator_loop_.get());
 }
 
 AudioInputController::~AudioInputController() {
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index 43d3e69..50d5328 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -90,7 +90,7 @@ TEST_F(AudioInputControllerTest, CreateAndClose) {
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
-  CloseAudioController(controller);
+  CloseAudioController(controller.get());
 }
 
 // Test a normal call sequence of create, record and close.
@@ -128,7 +128,7 @@ TEST_F(AudioInputControllerTest, RecordAndClose) {
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
-  CloseAudioController(controller);
+  CloseAudioController(controller.get());
 }
 
 // Test that the AudioInputController reports an error when the input stream
@@ -179,7 +179,7 @@ TEST_F(AudioInputControllerTest, RecordAndError) {
   message_loop_.Run();
 
   // Close the AudioInputController synchronously.
-  CloseAudioController(controller);
+  CloseAudioController(controller.get());
 }
 
 // Test that AudioInputController rejects insanely large packet sizes.
@@ -196,7 +196,7 @@ TEST_F(AudioInputControllerTest, SamplesPerPacketTooLarge) {
                          kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller =
       AudioInputController::Create(audio_manager.get(), &event_handler, params);
-  ASSERT_FALSE(controller);
+  ASSERT_FALSE(controller.get());
 }
 
 // Test calling AudioInputController::Close multiple times.
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 310e4be..07c56b6 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -204,7 +204,7 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
   AudioOutputDispatchersMap::iterator it =
       output_dispatchers_.find(dispatcher_key);
   if (it != output_dispatchers_.end())
-    return new AudioOutputProxy(it->second);
+    return new AudioOutputProxy(it->second.get());
 
   const base::TimeDelta kCloseDelay =
       base::TimeDelta::FromSeconds(kStreamCloseDelaySeconds);
@@ -213,13 +213,13 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
     scoped_refptr<AudioOutputDispatcher> dispatcher =
         new AudioOutputResampler(this, params, output_params, kCloseDelay);
     output_dispatchers_[dispatcher_key] = dispatcher;
-    return new AudioOutputProxy(dispatcher);
+    return new AudioOutputProxy(dispatcher.get());
   }
 
   scoped_refptr<AudioOutputDispatcher> dispatcher =
       new AudioOutputDispatcherImpl(this, output_params, kCloseDelay);
   output_dispatchers_[dispatcher_key] = dispatcher;
-  return new AudioOutputProxy(dispatcher);
+  return new AudioOutputProxy(dispatcher.get());
 #endif  // defined(OS_IOS)
 }
 
@@ -295,7 +295,7 @@ void AudioManagerBase::ShutdownOnAudioThread() {
   AudioOutputDispatchersMap::iterator it = output_dispatchers_.begin();
   for (; it != output_dispatchers_.end(); ++it) {
     scoped_refptr<AudioOutputDispatcher>& dispatcher = (*it).second;
-    if (dispatcher) {
+    if (dispatcher.get()) {
       dispatcher->Shutdown();
       // All AudioOutputProxies must have been freed before Shutdown is called.
       // If they still exist, things will go bad.  They have direct pointers to
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 350c5a1..9194bcf 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -55,7 +55,7 @@ AudioOutputController::AudioOutputController(AudioManager* audio_manager,
   DCHECK(audio_manager);
   DCHECK(handler_);
   DCHECK(sync_reader_);
-  DCHECK(message_loop_);
+  DCHECK(message_loop_.get());
 }
 
 AudioOutputController::~AudioOutputController() {
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index c6c2d45..20a56a2 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -124,10 +124,10 @@ class AudioOutputControllerTest : public testing::Test {
     controller_ = AudioOutputController::Create(
         audio_manager_.get(), &mock_event_handler_, params_,
         &mock_sync_reader_);
-    if (controller_)
+    if (controller_.get())
       controller_->SetVolume(kTestVolume);
 
-    EXPECT_EQ(params_.IsValid(), controller_ != NULL);
+    EXPECT_EQ(params_.IsValid(), controller_.get() != NULL);
   }
 
   void Play() {
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index fcbf56c..d55f726 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -483,94 +483,86 @@ class AudioOutputResamplerTest : public AudioOutputProxyTest {
 };
 
 TEST_F(AudioOutputProxyTest, CreateAndClose) {
-  AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_impl_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(dispatcher_impl_.get());
   proxy->Close();
 }
 
 TEST_F(AudioOutputResamplerTest, CreateAndClose) {
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
   proxy->Close();
 }
 
 TEST_F(AudioOutputProxyTest, OpenAndClose) {
-  OpenAndClose(dispatcher_impl_);
+  OpenAndClose(dispatcher_impl_.get());
 }
 
 TEST_F(AudioOutputResamplerTest, OpenAndClose) {
-  OpenAndClose(resampler_);
+  OpenAndClose(resampler_.get());
 }
 
 // Create a stream, and verify that it is closed after kTestCloseDelayMs.
 // if it doesn't start playing.
 TEST_F(AudioOutputProxyTest, CreateAndWait) {
-  CreateAndWait(dispatcher_impl_);
+  CreateAndWait(dispatcher_impl_.get());
 }
 
 // Create a stream, and verify that it is closed after kTestCloseDelayMs.
 // if it doesn't start playing.
 TEST_F(AudioOutputResamplerTest, CreateAndWait) {
-  CreateAndWait(resampler_);
+  CreateAndWait(resampler_.get());
 }
 
 TEST_F(AudioOutputProxyTest, StartAndStop) {
-  StartAndStop(dispatcher_impl_);
+  StartAndStop(dispatcher_impl_.get());
 }
 
 TEST_F(AudioOutputResamplerTest, StartAndStop) {
-  StartAndStop(resampler_);
+  StartAndStop(resampler_.get());
 }
 
 TEST_F(AudioOutputProxyTest, CloseAfterStop) {
-  CloseAfterStop(dispatcher_impl_);
+  CloseAfterStop(dispatcher_impl_.get());
 }
 
 TEST_F(AudioOutputResamplerTest, CloseAfterStop) {
-  CloseAfterStop(resampler_);
+  CloseAfterStop(resampler_.get());
 }
 
-TEST_F(AudioOutputProxyTest, TwoStreams) {
-  TwoStreams(dispatcher_impl_);
-}
+TEST_F(AudioOutputProxyTest, TwoStreams) { TwoStreams(dispatcher_impl_.get()); }
 
-TEST_F(AudioOutputResamplerTest, TwoStreams) {
-  TwoStreams(resampler_);
-}
+TEST_F(AudioOutputResamplerTest, TwoStreams) { TwoStreams(resampler_.get()); }
 
 // Two streams: verify that second stream is allocated when the first
 // starts playing.
 TEST_F(AudioOutputProxyTest, TwoStreams_OnePlaying) {
   InitDispatcher(base::TimeDelta::FromSeconds(kTestBigCloseDelaySeconds));
-  TwoStreams_OnePlaying(dispatcher_impl_);
+  TwoStreams_OnePlaying(dispatcher_impl_.get());
 }
 
 TEST_F(AudioOutputResamplerTest, TwoStreams_OnePlaying) {
   InitDispatcher(base::TimeDelta::FromSeconds(kTestBigCloseDelaySeconds));
-  TwoStreams_OnePlaying(resampler_);
+  TwoStreams_OnePlaying(resampler_.get());
 }
 
 // Two streams, both are playing. Dispatcher should not open a third stream.
 TEST_F(AudioOutputProxyTest, TwoStreams_BothPlaying) {
   InitDispatcher(base::TimeDelta::FromSeconds(kTestBigCloseDelaySeconds));
-  TwoStreams_BothPlaying(dispatcher_impl_);
+  TwoStreams_BothPlaying(dispatcher_impl_.get());
 }
 
 TEST_F(AudioOutputResamplerTest, TwoStreams_BothPlaying) {
   InitDispatcher(base::TimeDelta::FromSeconds(kTestBigCloseDelaySeconds));
-  TwoStreams_BothPlaying(resampler_);
+  TwoStreams_BothPlaying(resampler_.get());
 }
 
-TEST_F(AudioOutputProxyTest, OpenFailed) {
-  OpenFailed(dispatcher_impl_);
-}
+TEST_F(AudioOutputProxyTest, OpenFailed) { OpenFailed(dispatcher_impl_.get()); }
 
 // Start() method failed.
 TEST_F(AudioOutputProxyTest, StartFailed) {
-  StartFailed(dispatcher_impl_);
+  StartFailed(dispatcher_impl_.get());
 }
 
-TEST_F(AudioOutputResamplerTest, StartFailed) {
-  StartFailed(resampler_);
-}
+TEST_F(AudioOutputResamplerTest, StartFailed) { StartFailed(resampler_.get()); }
 
 // Simulate AudioOutputStream::Create() failure with a low latency stream and
 // ensure AudioOutputResampler falls back to the high latency path.
@@ -585,7 +577,7 @@ TEST_F(AudioOutputResamplerTest, LowLatencyCreateFailedFallback) {
   EXPECT_CALL(stream, Close())
       .Times(1);
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy->Open());
   proxy->Close();
   WaitForCloseTimer(kTestCloseDelayMs);
@@ -609,7 +601,7 @@ TEST_F(AudioOutputResamplerTest, LowLatencyOpenFailedFallback) {
   EXPECT_CALL(okay_stream, Close())
       .Times(1);
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy->Open());
   proxy->Close();
   WaitForCloseTimer(kTestCloseDelayMs);
@@ -645,7 +637,7 @@ TEST_F(AudioOutputResamplerTest, HighLatencyFallbackFailed) {
   EXPECT_CALL(okay_stream, Close())
       .Times(1);
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy->Open());
   proxy->Close();
   WaitForCloseTimer(kTestCloseDelayMs);
@@ -666,7 +658,7 @@ TEST_F(AudioOutputResamplerTest, AllFallbackFailed) {
       .Times(kFallbackCount)
       .WillRepeatedly(Return(static_cast<AudioOutputStream*>(NULL)));
 
-  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy = new AudioOutputProxy(resampler_.get());
   EXPECT_FALSE(proxy->Open());
   proxy->Close();
   WaitForCloseTimer(kTestCloseDelayMs);
@@ -710,19 +702,19 @@ TEST_F(AudioOutputResamplerTest, LowLatencyOpenEventuallyFails) {
       .Times(1);
 
   // Open and start the first proxy and stream.
-  AudioOutputProxy* proxy1 = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy1 = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy1->Open());
   proxy1->Start(&callback_);
   OnStart();
 
   // Open and start the second proxy and stream.
-  AudioOutputProxy* proxy2 = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy2 = new AudioOutputProxy(resampler_.get());
   EXPECT_TRUE(proxy2->Open());
   proxy2->Start(&callback_);
   OnStart();
 
   // Attempt to open the third stream which should fail.
-  AudioOutputProxy* proxy3 = new AudioOutputProxy(resampler_);
+  AudioOutputProxy* proxy3 = new AudioOutputProxy(resampler_.get());
   EXPECT_FALSE(proxy3->Open());
 
   // Perform the required Stop()/Close() shutdown dance for each proxy.  Under
diff --git a/media/audio/virtual_audio_input_stream.cc b/media/audio/virtual_audio_input_stream.cc
index aa1c265..7ad5a8c 100644
--- a/media/audio/virtual_audio_input_stream.cc
+++ b/media/audio/virtual_audio_input_stream.cc
@@ -60,7 +60,7 @@ VirtualAudioInputStream::VirtualAudioInputStream(
       num_attached_output_streams_(0),
       fake_consumer_(message_loop_, params_) {
   DCHECK(params_.IsValid());
-  DCHECK(message_loop_);
+  DCHECK(message_loop_.get());
 }
 
 VirtualAudioInputStream::~VirtualAudioInputStream() {
diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc
index 0c88672..144ce82 100644
--- a/media/audio/virtual_audio_input_stream_unittest.cc
+++ b/media/audio/virtual_audio_input_stream_unittest.cc
@@ -132,10 +132,11 @@ class VirtualAudioInputStreamTest : public testing::Test {
 
   void CreateAndStartOneOutputStream() {
     ASSERT_TRUE(!!stream_);
-    AudioOutputStream* const output_stream =
-        new VirtualAudioOutputStream(
-            kParams, audio_message_loop_, stream_,
-            base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
+    AudioOutputStream* const output_stream = new VirtualAudioOutputStream(
+        kParams,
+        audio_message_loop_.get(),
+        stream_,
+        base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
     output_streams_.push_back(output_stream);
 
     output_stream->Open();
diff --git a/media/audio/virtual_audio_output_stream_unittest.cc b/media/audio/virtual_audio_output_stream_unittest.cc
index 3eee9f1..21f7fe4 100644
--- a/media/audio/virtual_audio_output_stream_unittest.cc
+++ b/media/audio/virtual_audio_output_stream_unittest.cc
@@ -85,10 +85,11 @@ TEST_F(VirtualAudioOutputStreamTest, StartStopStartStop) {
           base::IgnoreResult(&MockVirtualAudioInputStream::Open),
           base::Unretained(input_stream)));
 
-  VirtualAudioOutputStream* const output_stream =
-      new VirtualAudioOutputStream(
-          kParams, audio_message_loop(), input_stream,
-          base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
+  VirtualAudioOutputStream* const output_stream = new VirtualAudioOutputStream(
+      kParams,
+      audio_message_loop().get(),
+      input_stream,
+      base::Bind(&base::DeletePointer<VirtualAudioOutputStream>));
 
   EXPECT_CALL(*input_stream, AddOutputStream(output_stream, _))
       .Times(kCycles);