| 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..450cbecf7460c94a6f2ad27be754ae22c1bd4e2e 100644
|
| --- a/content/renderer/media/buffered_data_source_unittest.cc
|
| +++ b/content/renderer/media/buffered_data_source_unittest.cc
|
| @@ -13,7 +13,7 @@
|
| #include "media/base/mock_filters.h"
|
| #include "media/base/test_helpers.h"
|
| #include "third_party/WebKit/public/platform/WebURLResponse.h"
|
| -#include "third_party/WebKit/public/web/WebFrame.h"
|
| +#include "third_party/WebKit/public/web/WebLocalFrame.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
|
|
| using ::testing::_;
|
| @@ -23,7 +23,7 @@ using ::testing::InSequence;
|
| using ::testing::NiceMock;
|
| using ::testing::StrictMock;
|
|
|
| -using blink::WebFrame;
|
| +using blink::WebLocalFrame;
|
| using blink::WebString;
|
| using blink::WebURLLoader;
|
| using blink::WebURLResponse;
|
| @@ -37,7 +37,7 @@ class MockBufferedDataSource : public BufferedDataSource {
|
| public:
|
| MockBufferedDataSource(
|
| const scoped_refptr<base::MessageLoopProxy>& message_loop,
|
| - WebFrame* frame,
|
| + WebLocalFrame* frame,
|
| media::DataSourceHost* host)
|
| : BufferedDataSource(message_loop, frame, new media::MediaLog(), host,
|
| base::Bind(&MockBufferedDataSource::set_downloading,
|
| @@ -93,11 +93,13 @@ static const char kFileUrl[] = "file:///tmp/bar.webm";
|
| class BufferedDataSourceTest : public testing::Test {
|
| public:
|
| BufferedDataSourceTest()
|
| - : view_(WebView::create(NULL)), frame_(WebFrame::create(&client_)) {
|
| + : view_(WebView::create(NULL)), frame_(WebLocalFrame::create(&client_)) {
|
| view_->setMainFrame(frame_);
|
|
|
| - data_source_.reset(new MockBufferedDataSource(
|
| - message_loop_.message_loop_proxy(), view_->mainFrame(), &host_));
|
| + data_source_.reset(
|
| + new MockBufferedDataSource(message_loop_.message_loop_proxy(),
|
| + view_->mainFrame()->toWebLocalFrame(),
|
| + &host_));
|
| }
|
|
|
| virtual ~BufferedDataSourceTest() {
|
| @@ -210,7 +212,7 @@ class BufferedDataSourceTest : public testing::Test {
|
| scoped_ptr<TestResponseGenerator> response_generator_;
|
| MockWebFrameClient client_;
|
| WebView* view_;
|
| - WebFrame* frame_;
|
| + WebLocalFrame* frame_;
|
|
|
| StrictMock<media::MockDataSourceHost> host_;
|
| base::MessageLoop message_loop_;
|
|
|