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

content/renderer/media/android/media_info_loader_unittest.cc

Index: content/renderer/media/android/media_info_loader_unittest.cc
diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc
index f60b53e8044979296812ecdb1cd39297f7b6b2f0..10c67c139200aad8ec242ab7edc8bca3fbade572 100644
--- a/content/renderer/media/android/media_info_loader_unittest.cc
+++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -7,12 +7,12 @@
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/renderer/media/android/media_info_loader.h"
+#include "content/test/mock_webframeclient.h"
 #include "content/test/mock_weburlloader.h"
 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.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"
 
@@ -40,13 +40,15 @@
 class MediaInfoLoaderTest : public testing::Test {
  public:
   MediaInfoLoaderTest()
-      : view_(WebView::create(nullptr, blink::WebPageVisibilityStateVisible)) {
-    view_->setMainFrame(
-        WebLocalFrame::create(blink::WebTreeScopeType::Document, &client_));
+      : view_(WebView::create(nullptr, blink::WebPageVisibilityStateVisible)),
+        frame_(WebLocalFrame::create(blink::WebTreeScopeType::Document,
+                                     &client_)) {
+    view_->setMainFrame(frame_);
   }
 
   virtual ~MediaInfoLoaderTest() {
     view_->close();
+    frame_->close();
   }
 
   void Initialize(
@@ -114,8 +116,9 @@
   std::unique_ptr<MediaInfoLoader> loader_;
   NiceMock<MockWebURLLoader>* url_loader_;
 
-  blink::WebFrameClient client_;
+  MockWebFrameClient client_;
   WebView* view_;
+  WebLocalFrame* frame_;
 
   base::MessageLoop message_loop_;