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

webkit/renderer/media/webaudiosourceprovider_impl_unittest.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/audio_parameters.h"
 #include "media/base/fake_audio_render_callback.h"
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProviderClient.h"
@@ skipping 15 matching lines @@
         fake_callback_(0.1),
         mock_sink_(new media::MockAudioRendererSink()),
         wasp_impl_(new WebAudioSourceProviderImpl(mock_sink_)) {
   }
 
   virtual ~WebAudioSourceProviderImplTest() {}
 
   void CallAllSinkMethodsAndVerify(bool verify) {
     testing::InSequence s;
 
-    EXPECT_CALL(*mock_sink_, Start()).Times(verify);
+    EXPECT_CALL(*mock_sink_.get(), Start()).Times(verify);
     wasp_impl_->Start();
 
-    EXPECT_CALL(*mock_sink_, Play()).Times(verify);
+    EXPECT_CALL(*mock_sink_.get(), Play()).Times(verify);
     wasp_impl_->Play();
 
-    EXPECT_CALL(*mock_sink_, Pause()).Times(verify);
+    EXPECT_CALL(*mock_sink_.get(), Pause()).Times(verify);
     wasp_impl_->Pause();
 
-    EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume)).Times(verify);
+    EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume)).Times(verify);
     wasp_impl_->SetVolume(kTestVolume);
 
-    EXPECT_CALL(*mock_sink_, Stop()).Times(verify);
+    EXPECT_CALL(*mock_sink_.get(), Stop()).Times(verify);
     wasp_impl_->Stop();
 
-    testing::Mock::VerifyAndClear(mock_sink_);
+    testing::Mock::VerifyAndClear(mock_sink_.get());
   }
 
   void SetClient(WebKit::WebAudioSourceProviderClient* client) {
     testing::InSequence s;
 
     if (client) {
-      EXPECT_CALL(*mock_sink_, Stop());
+      EXPECT_CALL(*mock_sink_.get(), Stop());
       EXPECT_CALL(*this, setFormat(params_.channels(), params_.sample_rate()));
     }
     wasp_impl_->setClient(client);
 
-    testing::Mock::VerifyAndClear(mock_sink_);
+    testing::Mock::VerifyAndClear(mock_sink_.get());
     testing::Mock::VerifyAndClear(this);
   }
 
   bool CompareBusses(const media::AudioBus* bus1, const media::AudioBus* bus2) {
     EXPECT_EQ(bus1->channels(), bus2->channels());
     EXPECT_EQ(bus1->frames(), bus2->frames());
     for (int ch = 0; ch < bus1->channels(); ++ch) {
       if (memcmp(bus1->channel(ch), bus2->channel(ch),
                  sizeof(*bus1->channel(ch)) * bus1->frames()) != 0) {
         return false;
@@ skipping 11 matching lines @@
   scoped_refptr<media::MockAudioRendererSink> mock_sink_;
   scoped_refptr<WebAudioSourceProviderImpl> wasp_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WebAudioSourceProviderImplTest);
 };
 
 TEST_F(WebAudioSourceProviderImplTest, SetClientBeforeInitialize) {
   // setClient() with a NULL client should do nothing if no client is set.
   wasp_impl_->setClient(NULL);
 
-  EXPECT_CALL(*mock_sink_, Stop());
+  EXPECT_CALL(*mock_sink_.get(), Stop());
   wasp_impl_->setClient(this);
 
   // When Initialize() is called after setClient(), the params should propagate
   // to the client via setFormat() during the call.
   EXPECT_CALL(*this, setFormat(params_.channels(), params_.sample_rate()));
   wasp_impl_->Initialize(params_, &fake_callback_);
 
   // setClient() with the same client should do nothing.
   wasp_impl_->setClient(this);
 }
 
 // Verify AudioRendererSink functionality w/ and w/o a client.
 TEST_F(WebAudioSourceProviderImplTest, SinkMethods) {
   wasp_impl_->Initialize(params_, &fake_callback_);
   ASSERT_EQ(mock_sink_->callback(), &fake_callback_);
 
   // Without a client all WASP calls should fall through to the underlying sink.
   CallAllSinkMethodsAndVerify(true);
 
   // With a client no calls should reach the Stop()'d sink.  Also, setClient()
   // should propagate the params provided during Initialize() at call time.
   SetClient(this);
   CallAllSinkMethodsAndVerify(false);
 
   // Removing the client should cause WASP to revert to the underlying sink.
-  EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume));
+  EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume));
   SetClient(NULL);
   CallAllSinkMethodsAndVerify(true);
 }
 
 // Verify underlying sink state is restored after client removal.
 TEST_F(WebAudioSourceProviderImplTest, SinkStateRestored) {
   wasp_impl_->Initialize(params_, &fake_callback_);
 
   // Verify state set before the client is set propagates back afterward.
-  EXPECT_CALL(*mock_sink_, Start());
+  EXPECT_CALL(*mock_sink_.get(), Start());
   wasp_impl_->Start();
   SetClient(this);
 
-  EXPECT_CALL(*mock_sink_, SetVolume(1.0));
-  EXPECT_CALL(*mock_sink_, Start());
+  EXPECT_CALL(*mock_sink_.get(), SetVolume(1.0));
+  EXPECT_CALL(*mock_sink_.get(), Start());
   SetClient(NULL);
 
   // Verify state set while the client was attached propagates back afterward.
   SetClient(this);
   wasp_impl_->Play();
   wasp_impl_->SetVolume(kTestVolume);
 
-  EXPECT_CALL(*mock_sink_, SetVolume(kTestVolume));
-  EXPECT_CALL(*mock_sink_, Start());
-  EXPECT_CALL(*mock_sink_, Play());
+  EXPECT_CALL(*mock_sink_.get(), SetVolume(kTestVolume));
+  EXPECT_CALL(*mock_sink_.get(), Start());
+  EXPECT_CALL(*mock_sink_.get(), Play());
   SetClient(NULL);
 }
 
 // Test the AudioRendererSink state machine and its effects on provideInput().
 TEST_F(WebAudioSourceProviderImplTest, ProvideInput) {
   scoped_ptr<media::AudioBus> bus1 = media::AudioBus::Create(params_);
   scoped_ptr<media::AudioBus> bus2 = media::AudioBus::Create(params_);
 
   // Point the WebVector into memory owned by |bus1|.
   WebKit::WebVector<float*> audio_data(static_cast<size_t>(bus1->channels()));
@@ skipping 55 matching lines @@
   ASSERT_FALSE(CompareBusses(bus1.get(), bus2.get()));
 
   // Stop() should return silence.
   wasp_impl_->Stop();
   bus1->channel(0)[0] = 1;
   wasp_impl_->provideInput(audio_data, params_.frames_per_buffer());
   ASSERT_TRUE(CompareBusses(bus1.get(), bus2.get()));
 }
 
 }  // namespace webkit_media