Refactor ContentViewClient (1/6)

content/browser/media/android/browser_surface_view_manager.cc

Index: content/browser/media/android/browser_surface_view_manager.cc
diff --git a/content/browser/media/android/browser_surface_view_manager.cc b/content/browser/media/android/browser_surface_view_manager.cc
index c5fab838c7d212d4ee6c9e0164448824b3d6322e..405f22812772ff218d717d15b34d21238e297da8 100644
--- a/content/browser/media/android/browser_surface_view_manager.cc
+++ b/content/browser/media/android/browser_surface_view_manager.cc
@@ -13,6 +13,7 @@
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/media/surface_view_manager_messages_android.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/web_contents_delegate.h"
 #include "media/base/surface_manager.h"
 #include "ui/gfx/geometry/size.h"
 
@@ -81,10 +82,15 @@ void BrowserSurfaceViewManager::OnCreateFullscreenSurface(
     return;
   }
 
-  ContentViewCore* cvc = ContentViewCore::FromWebContents(
-      WebContents::FromRenderFrameHost(render_frame_host_));
+  WebContents* web_contents =
+      WebContents::FromRenderFrameHost(render_frame_host_);
+  if (!web_contents->GetDelegate())
+    return;
+  ContentViewCore* cvc = ContentViewCore::FromWebContents(web_contents);
   content_video_view_.reset(
-      new ContentVideoView(this, cvc, video_natural_size));
+      new ContentVideoView(this, cvc,
+          web_contents->GetDelegate()->GetContentVideoViewEmbedder(),
+          video_natural_size));
 }
 
 void BrowserSurfaceViewManager::OnNaturalSizeChanged(const gfx::Size& size) {