Replace WebMediaSourceClient references with WebMediaSourceNew

This fixes up several places I missed in my previous change.
(https://src.chromium.org/viewvc/chrome?view=rev&revision=218819)

BUG=272993
TEST=All existing LayoutTests still pass.

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

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

3 files changed, 12 insertions, 12 deletions

diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index 935faec..c651764 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -48,11 +48,11 @@
 #include "media/filters/opus_audio_decoder.h"
 #include "media/filters/video_renderer_base.h"
 #include "media/filters/vpx_video_decoder.h"
+#include "third_party/WebKit/public/platform/WebMediaSource.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/public/web/WebMediaSource.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "v8/include/v8.h"
diff --git a/content/renderer/media/webmediasource_impl.cc b/content/renderer/media/webmediasource_impl.cc
index 21bdcd7..275b29a 100644
--- a/content/renderer/media/webmediasource_impl.cc
+++ b/content/renderer/media/webmediasource_impl.cc
@@ -11,12 +11,12 @@
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using ::WebKit::WebString;
-using ::WebKit::WebMediaSourceClient;
+using ::WebKit::WebMediaSourceNew;
 
 namespace content {
 
 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
-  COMPILE_ASSERT(static_cast<int>(WebMediaSourceClient::webkit_name) == \
+  COMPILE_ASSERT(static_cast<int>(WebMediaSourceNew::webkit_name) == \
                  static_cast<int>(media::ChunkDemuxer::chromium_name),  \
                  mismatching_status_enums)
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddStatusOk, kOk);
@@ -33,7 +33,7 @@ WebMediaSourceImpl::WebMediaSourceImpl(
 
 WebMediaSourceImpl::~WebMediaSourceImpl() {}
 
-WebMediaSourceClient::AddStatus WebMediaSourceImpl::addSourceBuffer(
+WebMediaSourceNew::AddStatus WebMediaSourceImpl::addSourceBuffer(
     const WebKit::WebString& type,
     const WebKit::WebVector<WebKit::WebString>& codecs,
     WebKit::WebSourceBuffer** source_buffer) {
@@ -41,11 +41,11 @@ WebMediaSourceClient::AddStatus WebMediaSourceImpl::addSourceBuffer(
   std::vector<std::string> new_codecs(codecs.size());
   for (size_t i = 0; i < codecs.size(); ++i)
     new_codecs[i] = codecs[i].utf8().data();
-  WebMediaSourceClient::AddStatus result =
-      static_cast<WebMediaSourceClient::AddStatus>(
+  WebMediaSourceNew::AddStatus result =
+      static_cast<WebMediaSourceNew::AddStatus>(
           demuxer_->AddId(id, type.utf8().data(), new_codecs));
 
-  if (result == WebMediaSourceClient::AddStatusOk)
+  if (result == WebMediaSourceNew::AddStatusOk)
     *source_buffer = new WebSourceBufferImpl(id, demuxer_);
 
   return result;
@@ -61,16 +61,16 @@ void WebMediaSourceImpl::setDuration(double new_duration) {
 }
 
 void WebMediaSourceImpl::markEndOfStream(
-    WebMediaSourceClient::EndOfStreamStatus status) {
+    WebMediaSourceNew::EndOfStreamStatus status) {
   media::PipelineStatus pipeline_status = media::PIPELINE_OK;
 
   switch (status) {
-    case WebMediaSourceClient::EndOfStreamStatusNoError:
+    case WebMediaSourceNew::EndOfStreamStatusNoError:
       break;
-    case WebMediaSourceClient::EndOfStreamStatusNetworkError:
+    case WebMediaSourceNew::EndOfStreamStatusNetworkError:
       pipeline_status = media::PIPELINE_ERROR_NETWORK;
       break;
-    case WebMediaSourceClient::EndOfStreamStatusDecodeError:
+    case WebMediaSourceNew::EndOfStreamStatusDecodeError:
       pipeline_status = media::PIPELINE_ERROR_DECODE;
       break;
     default:
diff --git a/content/renderer/media/webmediasource_impl.h b/content/renderer/media/webmediasource_impl.h
index 9bf5181..a09790b 100644
--- a/content/renderer/media/webmediasource_impl.h
+++ b/content/renderer/media/webmediasource_impl.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "media/base/media_log.h"
-#include "third_party/WebKit/public/web/WebMediaSourceClient.h"
+#include "third_party/WebKit/public/platform/WebMediaSource.h"
 
 namespace media {
 class ChunkDemuxer;