Remove MockWebFrame in favour of MockWebFrameClient and update corresponding tests.

This should help reduce WebKit gardening pain since all WebFrame implementations will reside in WebKit itself.

BUG=none
TEST=test_shell_tests

Review URL: http://codereview.chromium.org/6973051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85343 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 42 insertions, 28 deletions

diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index e66ea9a..4e53ba0 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,16 +92,18 @@ class MockBufferedResourceLoader : public BufferedResourceLoader {
 
 class BufferedDataSourceTest : public testing::Test {
  public:
-  BufferedDataSourceTest() {
+  BufferedDataSourceTest()
+      : view_(WebView::create(NULL)) {
+    view_->initializeMainFrame(&client_);
     message_loop_ = MessageLoop::current();
 
-    // Prepare test data.
     for (size_t i = 0; i < sizeof(data_); ++i) {
       data_[i] = i;
     }
   }
 
   virtual ~BufferedDataSourceTest() {
+    view_->close();
   }
 
   void ExpectCreateAndStartResourceLoader(int start_error) {
@@ -119,10 +123,8 @@ class BufferedDataSourceTest : public testing::Test {
     // Saves the url first.
     gurl_ = GURL(url);
 
-    frame_.reset(new NiceMock<MockWebFrame>());
-
     data_source_ = new MockBufferedDataSource(MessageLoop::current(),
-                                              frame_.get());
+                                              view_->mainFrame());
     data_source_->set_host(&host_);
 
     scoped_refptr<NiceMock<MockBufferedResourceLoader> > first_loader(
@@ -360,7 +362,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_;
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index 03fd360d..29f1a64 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,17 @@ ACTION_P(RequestCanceled, loader) {
 
 class BufferedResourceLoaderTest : public testing::Test {
  public:
-  BufferedResourceLoaderTest() {
-    for (int i = 0; i < kDataSize; ++i)
+  BufferedResourceLoaderTest()
+      : view_(WebView::create(NULL)) {
+    view_->initializeMainFrame(&client_);
+
+    for (int i = 0; i < kDataSize; ++i) {
       data_[i] = i;
+    }
   }
 
   virtual ~BufferedResourceLoaderTest() {
+    view_->close();
   }
 
   void Initialize(const char* url, int first_position, int last_position) {
@@ -80,8 +85,6 @@ class BufferedResourceLoaderTest : public testing::Test {
     first_position_ = first_position;
     last_position_ = last_position;
 
-    frame_.reset(new NiceMock<MockWebFrame>());
-
     url_loader_ = new NiceMock<MockWebURLLoader>();
     loader_ = new BufferedResourceLoader(gurl_,
                                          first_position_, last_position_);
@@ -99,7 +102,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 +234,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];
 
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index 61e41f2..264b685 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -7,13 +7,13 @@
 #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/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoader.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.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/simple_data_source.h"
-#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_webframeclient.h"
 #include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
@@ -31,6 +31,7 @@ using WebKit::WebURLError;
 using WebKit::WebURLLoader;
 using WebKit::WebURLRequest;
 using WebKit::WebURLResponse;
+using WebKit::WebView;
 
 namespace webkit_glue {
 
@@ -49,24 +50,27 @@ static const char kHttpRedirectToDifferentDomainUrl2[] = "http://test2/ing";
 
 class SimpleDataSourceTest : public testing::Test {
  public:
-  SimpleDataSourceTest() {
+  SimpleDataSourceTest()
+      : view_(WebView::create(NULL)) {
+    view_->initializeMainFrame(&client_);
+
     for (int i = 0; i < kDataSize; ++i) {
       data_[i] = i;
     }
   }
 
   virtual ~SimpleDataSourceTest() {
+    view_->close();
   }
 
   void InitializeDataSource(const char* url,
                             media::MockStatusCallback* callback) {
     gurl_ = GURL(url);
 
-    frame_.reset(new NiceMock<MockWebFrame>());
     url_loader_ = new NiceMock<MockWebURLLoader>();
 
     data_source_ = new SimpleDataSource(MessageLoop::current(),
-                                        frame_.get());
+                                        view_->mainFrame());
 
     // There is no need to provide a message loop to data source.
     data_source_->set_host(&host_);
@@ -114,8 +118,8 @@ class SimpleDataSourceTest : public testing::Test {
 
   void Redirect(const char* url) {
     GURL redirectUrl(url);
-    WebKit::WebURLRequest newRequest(redirectUrl);
-    WebKit::WebURLResponse redirectResponse(gurl_);
+    WebURLRequest newRequest(redirectUrl);
+    WebURLResponse redirectResponse(gurl_);
 
     data_source_->willSendRequest(url_loader_, newRequest, redirectResponse);
 
@@ -149,7 +153,9 @@ class SimpleDataSourceTest : public testing::Test {
   NiceMock<MockWebURLLoader>* url_loader_;
   scoped_refptr<SimpleDataSource> data_source_;
   StrictMock<media::MockFilterHost> host_;
-  scoped_ptr<NiceMock<MockWebFrame> > frame_;
+
+  MockWebFrameClient client_;
+  WebView* view_;
 
   char data_[kDataSize];
 
@@ -178,11 +184,10 @@ TEST_F(SimpleDataSourceTest, InitializeFile) {
 }
 
 TEST_F(SimpleDataSourceTest, InitializeData) {
-  frame_.reset(new NiceMock<MockWebFrame>());
   url_loader_ = new NiceMock<MockWebURLLoader>();
 
   data_source_ = new SimpleDataSource(MessageLoop::current(),
-                                      frame_.get());
+                                      view_->mainFrame());
   // There is no need to provide a message loop to data source.
   data_source_->set_host(&host_);
   data_source_->SetURLLoaderForTest(url_loader_);