Rename DemuxerStreamProvider into MediaResource

media/renderers/renderer_impl_unittest.cc

Index: media/renderers/renderer_impl_unittest.cc
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index 3fc74307f58a292851cd40c47be835f95a1dd97b..80d8dc7314488f425850a64ec605681d64854c87 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -162,13 +162,13 @@ class RendererImplTest : public ::testing::Test {
     CreateAudioStream();
     SetAudioRendererInitializeExpectations(PIPELINE_OK);
     // There is a potential race between HTMLMediaElement/WMPI shutdown and
-    // renderers being initialized which might result in DemuxerStreamProvider
-    // GetStream suddenly returning NULL (see crbug.com/668604). So we are going
-    // to check here that GetStream will be invoked exactly 3 times during
-    // RendererImpl initialization to help catch potential issues. Currently the
-    // GetStream is invoked once directly from RendererImpl::Initialize, once
-    // indirectly from RendererImpl::Initialize via HasEncryptedStream and once
-    // from RendererImpl::InitializeAudioRenderer.
+    // renderers being initialized which might result in MediaResource GetStream
+    // suddenly returning NULL (see crbug.com/668604). So we are going to check
+    // here that GetStream will be invoked exactly 3 times during RendererImpl
+    // initialization to help catch potential issues. Currently the GetStream is
+    // invoked once directly from RendererImpl::Initialize, once indirectly from
+    // RendererImpl::Initialize via HasEncryptedStream and once from
+    // RendererImpl::InitializeAudioRenderer.
     EXPECT_CALL(*demuxer_, GetStream(DemuxerStream::AUDIO))
         .Times(2)
         .WillRepeatedly(Return(audio_stream_.get()));
@@ -179,13 +179,13 @@ class RendererImplTest : public ::testing::Test {
     CreateVideoStream();
     SetVideoRendererInitializeExpectations(PIPELINE_OK);
     // There is a potential race between HTMLMediaElement/WMPI shutdown and
-    // renderers being initialized which might result in DemuxerStreamProvider
-    // GetStream suddenly returning NULL (see crbug.com/668604). So we are going
-    // to check here that GetStream will be invoked exactly 3 times during
-    // RendererImpl initialization to help catch potential issues. Currently the
-    // GetStream is invoked once directly from RendererImpl::Initialize, once
-    // indirectly from RendererImpl::Initialize via HasEncryptedStream and once
-    // from RendererImpl::InitializeVideoRenderer.
+    // renderers being initialized which might result in MediaResource GetStream
+    // suddenly returning NULL (see crbug.com/668604). So we are going to check
+    // here that GetStream will be invoked exactly 3 times during RendererImpl
+    // initialization to help catch potential issues. Currently the GetStream is
+    // invoked once directly from RendererImpl::Initialize, once indirectly from
+    // RendererImpl::Initialize via HasEncryptedStream and once from
+    // RendererImpl::InitializeVideoRenderer.
     EXPECT_CALL(*demuxer_, GetStream(DemuxerStream::VIDEO))
         .Times(2)
         .WillRepeatedly(Return(video_stream_.get()));