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

content/renderer/media/android/media_info_loader_unittest.cc

 // Copyright 2013 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 "base/bind.h"
 #include "base/macros.h"
 #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"
 
 using ::testing::_;
 using ::testing::InSequence;
 using ::testing::NiceMock;
 
 using blink::WebLocalFrame;
 using blink::WebString;
 using blink::WebURLError;
 using blink::WebURLResponse;
 using blink::WebView;
 
 namespace content {
 
 static const char* kHttpUrl = "http://test";
 static const char kHttpRedirectToSameDomainUrl1[] = "http://test/ing";
 static const char kHttpRedirectToSameDomainUrl2[] = "http://test/ing2";
 static const char kHttpRedirectToDifferentDomainUrl1[] = "http://test2";
 static const char kHttpDataUrl[] = "data:audio/wav;base64,UklGRhwMAABXQVZFZm10";
 
 static const int kHttpOK = 200;
 static const int kHttpNotFound = 404;
 
 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(
       const char* url,
       blink::WebMediaPlayer::CORSMode cors_mode) {
     gurl_ = GURL(url);
 
     loader_.reset(new MediaInfoLoader(
         gurl_, cors_mode,
         base::Bind(&MediaInfoLoaderTest::ReadyCallback,
@@ skipping 47 matching lines @@
 
   MOCK_METHOD4(ReadyCallback,
                void(MediaInfoLoader::Status, const GURL&, const GURL&, bool));
 
  protected:
   GURL gurl_;
 
   std::unique_ptr<MediaInfoLoader> loader_;
   NiceMock<MockWebURLLoader>* url_loader_;
 
-  blink::WebFrameClient client_;
+  MockWebFrameClient client_;
   WebView* view_;
+  WebLocalFrame* frame_;
 
   base::MessageLoop message_loop_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MediaInfoLoaderTest);
 };
 
 TEST_F(MediaInfoLoaderTest, StartStop) {
   Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUnspecified);
   Start();
@@ skipping 66 matching lines @@
 }
 
 TEST_F(MediaInfoLoaderTest, CORSAccessCheckFailed) {
   Initialize(kHttpUrl, blink::WebMediaPlayer::CORSModeUseCredentials);
   Start();
   SendResponse(kHttpNotFound, MediaInfoLoader::kFailed);
   EXPECT_FALSE(loader_->DidPassCORSAccessCheck());
 }
 
 }  // namespace content