Revert 68094 - Refactoring BufferedDataSource to work with WebURLLoader inste...

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 2800 matching lines @@
 
     // 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(
         MessageLoop::current(), context->context()));
   }
 
-  // TODO(annacc): do we still need appcache_host?  http://crbug.com/65135
-  // WebApplicationCacheHostImpl* appcache_host =
-  //     WebApplicationCacheHostImpl::FromFrame(frame);
+  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(
+          GURL(frame->url()),  // referrer
+          "null",  // frame origin
+          "null",  // main_frame_origin
+          base::GetCurrentProcId(),
+          appcache_host ? appcache_host->host_id() : appcache::kNoHostId,
+          routing_id());
+
+  webkit_glue::MediaResourceLoaderBridgeFactory* bridge_factory_buffered =
+      new webkit_glue::MediaResourceLoaderBridgeFactory(
+          GURL(frame->url()),  // referrer
+          "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);
   video_renderer = renderer;
 
   scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(
       new webkit_glue::WebMediaPlayerImpl(client, collection.release()));
-  if (!result->Initialize(frame,
+  if (!result->Initialize(bridge_factory_simple,
+                          bridge_factory_buffered,
                           cmd_line->HasSwitch(switches::kSimpleDataSource),
                           video_renderer)) {
     return NULL;
   }
   return result.release();
 }
 
 WebApplicationCacheHost* RenderView::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   return new RendererWebApplicationCacheHostImpl(
@@ skipping 2822 matching lines @@
   external_popup_menu_.reset();
 }
 #endif
 
 void RenderView::AddErrorToRootConsole(const string16& message) {
   if (webview() && webview()->mainFrame()) {
     webview()->mainFrame()->addMessageToConsole(
         WebConsoleMessage(WebConsoleMessage::LevelError, message));
   }
 }