Remove MockWebFrame in favour of MockWebFrameClient and update corresponding tests.

webkit/glue/media/buffered_data_source_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "base/test/test_timeouts.h"
 #include "media/base/mock_callback.h"
 #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;
 using ::testing::AtLeast;
 using ::testing::DeleteArg;
 using ::testing::DoAll;
 using ::testing::InSequence;
 using ::testing::Invoke;
 using ::testing::InvokeWithoutArgs;
 using ::testing::NotNull;
 using ::testing::Return;
 using ::testing::ReturnRef;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
 using ::testing::NiceMock;
 using ::testing::WithArgs;
 
+using WebKit::WebFrame;
+using WebKit::WebView;
+
 namespace webkit_glue {
 
 static const char* kHttpUrl = "http://test";
 static const char* kFileUrl = "file://test";
 static const int kDataSize = 1024;
 
 enum NetworkState {
   NONE,
   LOADED,
   LOADING
@@ skipping 40 matching lines @@
   MOCK_METHOD0(GetBufferedLastBytePosition, int64());
 
  protected:
   ~MockBufferedResourceLoader() {}
 
   DISALLOW_COPY_AND_ASSIGN(MockBufferedResourceLoader);
 };
 
 class BufferedDataSourceTest : public testing::Test {
  public:
-  BufferedDataSourceTest() {
+  BufferedDataSourceTest()
+      : view_(NULL) {
     message_loop_ = MessageLoop::current();
 
     // Prepare test data.
     for (size_t i = 0; i < sizeof(data_); ++i) {
       data_[i] = i;
     }
   }
 
   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) {
     EXPECT_CALL(*data_source_, CreateResourceLoader(_, _))
         .WillOnce(Return(loader_.get()));
 
     EXPECT_CALL(*loader_, Start(NotNull(), NotNull(), NotNull()))
         .WillOnce(
             DoAll(Assign(&error_, start_error),
                   Invoke(this,
                          &BufferedDataSourceTest::InvokeStartCallback)));
   }
 
   void InitializeDataSource(const char* url, int error,
                             bool partial_response, int64 instance_size,
                             NetworkState networkState) {
     // 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(
         new NiceMock<MockBufferedResourceLoader>());
 
     // Creates the mock loader to be injected.
     loader_ = first_loader;
 
     bool initialized_ok = (error == net::OK);
     bool loaded = networkState == LOADED;
@@ skipping 217 matching lines @@
         position, size, buffer_,
         NewCallback(this, &BufferedDataSourceTest::ReadCallback));
 
     message_loop_->RunAllPending();
   }
 
   MOCK_METHOD1(ReadCallback, void(size_t size));
 
   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_;
   MessageLoop* message_loop_;
 
   int error_;
   uint8 buffer_[1024];
   uint8 data_[1024];
 
  private:
@@ skipping 134 matching lines @@
   data_source_->Stop(media::NewExpectedCallback());
 
   // Allow cleanup task to run.
   message_loop_->RunAllPending();
 
   // Verify that Read() was not called on the loader.
   EXPECT_FALSE(read_called);
 }
 
 }  // namespace webkit_glue