Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1332)

Unified Diff: content/renderer/media/buffered_data_source_unittest.cc

Issue 224093011: Move DataSourceHost to BufferedDataSourceHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix windows release build. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/buffered_data_source_unittest.cc
diff --git a/content/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc
index 9a2500670e5d223cd9f212ba05fe98492775ee3d..718fd2125fc2963fe2cb4e40c91f464ae1fb1ba2 100644
--- a/content/renderer/media/buffered_data_source_unittest.cc
+++ b/content/renderer/media/buffered_data_source_unittest.cc
@@ -4,12 +4,12 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
+#include "content/public/common/url_constants.h"
#include "content/renderer/media/buffered_data_source.h"
#include "content/renderer/media/test_response_generator.h"
#include "content/test/mock_webframeclient.h"
#include "content/test/mock_weburlloader.h"
#include "media/base/media_log.h"
-#include "media/base/mock_data_source_host.h"
#include "media/base/mock_filters.h"
#include "media/base/test_helpers.h"
#include "third_party/WebKit/public/platform/WebURLResponse.h"
@@ -31,6 +31,18 @@ using blink::WebView;
namespace content {
+class MockBufferedDataSourceHost : public BufferedDataSourceHost {
+ public:
+ MockBufferedDataSourceHost() {}
+ virtual ~MockBufferedDataSourceHost() {}
+
+ MOCK_METHOD1(SetTotalBytes, void(int64 total_bytes));
+ MOCK_METHOD2(AddBufferedByteRange, void(int64 start, int64 end));
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(MockBufferedDataSourceHost);
+};
+
// Overrides CreateResourceLoader() to permit injecting a MockWebURLLoader.
// Also keeps track of whether said MockWebURLLoader is actively loading.
class MockBufferedDataSource : public BufferedDataSource {
@@ -38,7 +50,7 @@ class MockBufferedDataSource : public BufferedDataSource {
MockBufferedDataSource(
const scoped_refptr<base::MessageLoopProxy>& message_loop,
WebFrame* frame,
- media::DataSourceHost* host)
+ BufferedDataSourceHost* host)
: BufferedDataSource(message_loop, frame, new media::MediaLog(), host,
base::Bind(&MockBufferedDataSource::set_downloading,
base::Unretained(this))),
@@ -212,7 +224,7 @@ class BufferedDataSourceTest : public testing::Test {
WebView* view_;
WebFrame* frame_;
- StrictMock<media::MockDataSourceHost> host_;
+ StrictMock<MockBufferedDataSourceHost> host_;
base::MessageLoop message_loop_;
private:
« no previous file with comments | « content/renderer/media/buffered_data_source_host_impl_unittest.cc ('k') | content/renderer/media/buffered_resource_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698