Revert 66125 -- Broke Windows build - Move FilterType into MediaFilterCollect...

chrome/renderer/render_view.cc

 // Copyright (c) 2010 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 "chrome/renderer/render_view.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 2618 matching lines @@
 
 WebMediaPlayer* RenderView::createMediaPlayer(
     WebFrame* frame, WebMediaPlayerClient* client) {
   scoped_ptr<media::MediaFilterCollection> collection(
       new media::MediaFilterCollection());
 
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
-    collection->AddAudioRenderer(new AudioRendererImpl(audio_message_filter()));
+    collection->AddFilter(new AudioRendererImpl(audio_message_filter()));
   }
 
   if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) &&
       !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) {
     WebGraphicsContext3DCommandBufferImpl* context =
         static_cast<WebGraphicsContext3DCommandBufferImpl*>(
             frame->view()->graphicsContext3D());
     if (!context)
       return NULL;
 
     // Add the hardware video decoder factory.
     // TODO(hclam): This will cause the renderer process to crash on context
     // lost.
     bool ret = context->makeContextCurrent();
     CHECK(ret) << "Failed to switch context";
-    collection->AddVideoDecoder(new IpcVideoDecoder(
+    collection->AddFilter(new IpcVideoDecoder(
         MessageLoop::current(), context->context()));
   }
 
   WebApplicationCacheHostImpl* appcache_host =
       WebApplicationCacheHostImpl::FromFrame(frame);
 
   // TODO(hclam): obtain the following parameters from |client|.
   // Create two bridge factory for two data sources.
   webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_simple =
       new webkit_glue::MediaResourceLoaderBridgeFactory(
@@ skipping 10 matching lines @@
           "null",  // frame origin
           "null",  // main_frame_origin
           base::GetCurrentProcId(),
           appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
           routing_id());
 
   scoped_refptr<webkit_glue::WebVideoRenderer> video_renderer;
   bool pts_logging = cmd_line->HasSwitch(switches::kEnableVideoLogging);
   scoped_refptr<webkit_glue::VideoRendererImpl> renderer(
       new webkit_glue::VideoRendererImpl(pts_logging));
-  collection->AddVideoRenderer(renderer);
+  collection->AddFilter(renderer);
   video_renderer = renderer;
 
   return new webkit_glue::WebMediaPlayerImpl(
       client, collection.release(), bridge_factory_simple,
       bridge_factory_buffered,
       cmd_line->HasSwitch(switches::kSimpleDataSource),video_renderer);
 }
 
 WebApplicationCacheHost* RenderView::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
@@ skipping 2791 matching lines @@
       IPC::PlatformFileForTransitToPlatformFile(file_for_transit),
       message_id);
 }
 
 #if defined(OS_MACOSX)
 void RenderView::OnSelectPopupMenuItem(int selected_index) {
   external_popup_menu_->DidSelectItem(selected_index);
   external_popup_menu_.reset();
 }
 #endif