Revert of Require WebLocalFrame to be created with a non-null client

media/blink/multibuffer_data_source_unittest.cc

Index: media/blink/multibuffer_data_source_unittest.cc
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index 8142aa5cfd60638512b359e14c1dc52fc199e246..91cfe3d65bc9609c51179f017cf9a42bcac512ce 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -14,13 +14,13 @@
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "media/blink/buffered_data_source_host_impl.h"
+#include "media/blink/mock_webframeclient.h"
 #include "media/blink/mock_weburlloader.h"
 #include "media/blink/multibuffer_data_source.h"
 #include "media/blink/multibuffer_reader.h"
 #include "media/blink/resource_multibuffer_data_provider.h"
 #include "media/blink/test_response_generator.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
-#include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 
@@ -225,15 +225,16 @@
  public:
   MultibufferDataSourceTest()
       : view_(WebView::create(nullptr, blink::WebPageVisibilityStateVisible)),
-        preload_(MultibufferDataSource::AUTO) {
-    WebLocalFrame* frame =
-        WebLocalFrame::create(blink::WebTreeScopeType::Document, &client_);
-    view_->setMainFrame(frame);
-    url_index_ = make_linked_ptr(new TestUrlIndex(frame));
+        frame_(
+            WebLocalFrame::create(blink::WebTreeScopeType::Document, &client_)),
+        preload_(MultibufferDataSource::AUTO),
+        url_index_(make_linked_ptr(new TestUrlIndex(frame_))) {
+    view_->setMainFrame(frame_);
   }
 
   virtual ~MultibufferDataSourceTest() {
     view_->close();
+    frame_->close();
   }
 
   MOCK_METHOD1(OnInitialize, void(bool));
@@ -475,8 +476,9 @@
   }
 
  protected:
-  blink::WebFrameClient client_;
+  MockWebFrameClient client_;
   WebView* view_;
+  WebLocalFrame* frame_;
   MultibufferDataSource::Preload preload_;
   base::MessageLoop message_loop_;
   linked_ptr<TestUrlIndex> url_index_;