Move DataSourceHost to BufferedDataSourceHost.

content/renderer/media/buffered_data_source.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 "content/renderer/media/buffered_data_source.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop_proxy.h"
+#include "content/public/common/url_constants.h"

[scherkus (not reviewing), 2014/04/03 21:59:37]

is this because you removed the kHttpScheme constants?

[sandersd (OOO until July 31), 2014/04/04 23:48:41]

Yes, but I removed them because of a link error.

 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 
 using blink::WebFrame;
 
 namespace {
 
 // BufferedDataSource has an intermediate buffer, this value governs the initial
 // size of that buffer. It is set to 32KB because this is a typical read size
 // of FFmpeg.
 const int kInitialReadBufferSize = 32768;
 
 // Number of cache misses we allow for a single Read() before signaling an
 // error.
 const int kNumCacheMissRetries = 3;
 
 }  // namespace
 
 namespace content {
 
+BufferedDataSourceHost::~BufferedDataSourceHost() {}
+
 class BufferedDataSource::ReadOperation {
  public:
   ReadOperation(int64 position, int size, uint8* data,
                 const media::DataSource::ReadCB& callback);
   ~ReadOperation();
 
   // Runs |callback_| with the given |result|, deleting the operation
   // afterwards.
   static void Run(scoped_ptr<ReadOperation> read_op, int result);
 
@@ skipping 34 matching lines @@
 // static
 void BufferedDataSource::ReadOperation::Run(
     scoped_ptr<ReadOperation> read_op, int result) {
   base::ResetAndReturn(&read_op->callback_).Run(result);
 }
 
 BufferedDataSource::BufferedDataSource(
     const scoped_refptr<base::MessageLoopProxy>& render_loop,
     WebFrame* frame,
     media::MediaLog* media_log,
-    media::DataSourceHost* host,
+    BufferedDataSourceHost* host,
     const DownloadingCB& downloading_cb)
     : cors_mode_(BufferedResourceLoader::kUnspecified),
       total_bytes_(kPositionNotSpecified),
       assume_fully_buffered_(false),
       streaming_(false),
       frame_(frame),
       intermediate_read_buffer_(new uint8[kInitialReadBufferSize]),
       intermediate_read_buffer_size_(kInitialReadBufferSize),
       render_loop_(render_loop),
       stop_signal_received_(false),
@@ skipping 435 matching lines @@
     return;
   }
 
   // If media is currently playing or the page indicated preload=auto,
   // use threshold strategy to enable/disable deferring when the buffer
   // is full/depleted.
   loader_->UpdateDeferStrategy(BufferedResourceLoader::kCapacityDefer);
 }
 
 }  // namespace content