Remove MockWebFrame in favour of MockWebFrameClient and update corresponding tests.

webkit/glue/media/buffered_data_source_unittest.cc

Index: webkit/glue/media/buffered_data_source_unittest.cc
diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index e66ea9af5adaa1e74c7a2e733163c27a50e0fd86..0f98a8add01e0eaa39aa4d67de81ea98f570d448 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -9,10 +9,9 @@
 #include "media/base/mock_filter_host.h"
 #include "media/base/mock_filters.h"
 #include "net/base/net_errors.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_webframeclient.h"
 
 using ::testing::_;
 using ::testing::Assign;
@@ -30,6 +29,9 @@ using ::testing::StrictMock;
 using ::testing::NiceMock;
 using ::testing::WithArgs;
 
+using WebKit::WebFrame;
+using WebKit::WebView;
+
 namespace webkit_glue {
 
 static const char* kHttpUrl = "http://test";
@@ -90,7 +92,8 @@ class MockBufferedResourceLoader : public BufferedResourceLoader {
 
 class BufferedDataSourceTest : public testing::Test {
  public:
-  BufferedDataSourceTest() {
+  BufferedDataSourceTest()
+      : view_(NULL) {
     message_loop_ = MessageLoop::current();
 
     // Prepare test data.
@@ -100,6 +103,9 @@ class BufferedDataSourceTest : public testing::Test {
   }
 
   virtual ~BufferedDataSourceTest() {
+    if (view_) {

[acolwell GONE FROM CHROMIUM, 2011/05/13 17:36:37]

nit: braces not necessary

[scherkus (not reviewing), 2011/05/13 19:35:20]

Done.

+      view_->close();
+    }
   }
 
   void ExpectCreateAndStartResourceLoader(int start_error) {
@@ -119,10 +125,11 @@ class BufferedDataSourceTest : public testing::Test {
     // Saves the url first.
     gurl_ = GURL(url);
 
-    frame_.reset(new NiceMock<MockWebFrame>());
+    view_ = WebView::create(NULL);
+    view_->initializeMainFrame(&client_);
 
     data_source_ = new MockBufferedDataSource(MessageLoop::current(),
-                                              frame_.get());
+                                              view_->mainFrame());
     data_source_->set_host(&host_);
 
     scoped_refptr<NiceMock<MockBufferedResourceLoader> > first_loader(
@@ -360,7 +367,9 @@ class BufferedDataSourceTest : public testing::Test {
 
   scoped_refptr<NiceMock<MockBufferedResourceLoader> > loader_;
   scoped_refptr<MockBufferedDataSource> data_source_;
-  scoped_ptr<NiceMock<MockWebFrame> > frame_;
+
+  MockWebFrameClient client_;
+  WebView* view_;
 
   StrictMock<media::MockFilterHost> host_;
   GURL gurl_;