Remove MockWebFrame in favour of MockWebFrameClient and update corresponding tests.

webkit/glue/media/buffered_resource_loader_unittest.cc

Index: webkit/glue/media/buffered_resource_loader_unittest.cc
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index 03fd360df3b2881aab4865551a80962528b4c24a..426b5e4ecd98c235abc852b587e587cbef69314f 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/glue/media/buffered_resource_loader_unittest.cc
@@ -9,12 +9,12 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebString.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_resource_loader.h"
-#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
@@ -33,8 +33,8 @@ using ::testing::StrictMock;
 using ::testing::NiceMock;
 using ::testing::WithArgs;
 
+using WebKit::WebString;
 using WebKit::WebURLError;
-using WebKit::WebFrameClient;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
@@ -67,12 +67,16 @@ ACTION_P(RequestCanceled, loader) {
 
 class BufferedResourceLoaderTest : public testing::Test {
  public:
-  BufferedResourceLoaderTest() {
+  BufferedResourceLoaderTest()
+      : view_(NULL) {
     for (int i = 0; i < kDataSize; ++i)
       data_[i] = i;
   }
 
   virtual ~BufferedResourceLoaderTest() {
+    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 Initialize(const char* url, int first_position, int last_position) {
@@ -80,7 +84,8 @@ class BufferedResourceLoaderTest : public testing::Test {
     first_position_ = first_position;
     last_position_ = last_position;
 
-    frame_.reset(new NiceMock<MockWebFrame>());
+    view_ = WebView::create(NULL);
+    view_->initializeMainFrame(&client_);
 
     url_loader_ = new NiceMock<MockWebURLLoader>();
     loader_ = new BufferedResourceLoader(gurl_,
@@ -99,7 +104,7 @@ class BufferedResourceLoaderTest : public testing::Test {
     loader_->Start(
         NewCallback(this, &BufferedResourceLoaderTest::StartCallback),
         NewCallback(this, &BufferedResourceLoaderTest::NetworkCallback),
-        frame_.get());
+        view_->mainFrame());
   }
 
   void FullResponse(int64 instance_size) {
@@ -231,7 +236,9 @@ class BufferedResourceLoaderTest : public testing::Test {
 
   scoped_refptr<BufferedResourceLoader> loader_;
   NiceMock<MockWebURLLoader>* url_loader_;
-  scoped_ptr<NiceMock<MockWebFrame> > frame_;
+
+  MockWebFrameClient client_;
+  WebView* view_;
 
   uint8 data_[kDataSize];