Refactor ContentViewClient (1/6)

content/browser/media/android/browser_media_player_manager.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 "content/browser/media/android/browser_media_player_manager.h"
 
 #include <utility>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
@@ skipping 196 matching lines @@
 
       if (media_player_params.type == MEDIA_PLAYER_TYPE_REMOTE_ONLY)
         return media_player_bridge;
 
       bool should_block = false;
       bool extract_metadata =
           // Initialize the player will cause MediaMetadataExtractor to decode
           // small chunks of data.
           RequestDecoderResources(media_player_params.player_id, true);
 #if !defined(USE_AURA)
-      ContentViewCoreImpl* content_view_core_impl =
-          static_cast<ContentViewCoreImpl*>(
-              ContentViewCore::FromWebContents(web_contents_));
-      if (!content_view_core_impl) {
+      if (WebContentsDelegate* delegate = web_contents_->GetDelegate())

[boliu, 2016/09/26 21:25:25]

style: need braces if the body is more than one line

[Jinsuk Kim, 2016/09/27 10:08:59]

Done.

+        should_block =
+            delegate->ShouldBlockMediaRequest(media_player_params.url);
+      else
         extract_metadata = false;
-      } else {
-        should_block = content_view_core_impl->ShouldBlockMediaRequest(
-            media_player_params.url);
-      }
 #endif
       if (!extract_metadata) {
         // May reach here due to prerendering or throttling. Don't extract the
         // metadata since it is expensive.
         // TODO(qinmin): extract the metadata once the user decided to load
         // the page.
         OnMediaMetadataChanged(media_player_params.player_id, base::TimeDelta(),
                                0, 0, false);
       } else if (!should_block) {
         media_player_bridge->Initialize();
@@ skipping 212 matching lines @@
 
   // There's no ContentVideoView instance so create one.
   // If we know the video frame size, use it.
   gfx::Size natural_video_size;
   MediaPlayerAndroid* player = GetFullscreenPlayer();
   if (player && player->IsPlayerReady()) {
     natural_video_size =
         gfx::Size(player->GetVideoWidth(), player->GetVideoHeight());
   }
 
+  base::android::ScopedJavaLocalRef<jobject> embedder(
+      web_contents()->GetDelegate()->GetContentVideoViewEmbedder());

[boliu, 2016/09/26 21:25:25]

null check GetDelegate

[Jinsuk Kim, 2016/09/27 10:08:58]

Done.

   video_view_.reset(
-      new ContentVideoView(this, GetContentViewCore(), natural_video_size));
+      new ContentVideoView(this,
+                           GetContentViewCore(),
+                           embedder,
+                           natural_video_size));
 
   base::android::ScopedJavaLocalRef<jobject> j_content_video_view =
       video_view_->GetJavaObject(base::android::AttachCurrentThread());
   if (!j_content_video_view.is_null()) {
     fullscreen_player_id_ = player_id;
   } else {
     Send(new MediaPlayerMsg_DidExitFullscreen(RoutingID(), player_id));
     video_view_.reset();
   }
 #endif  // defined(USE_AURA)
@@ skipping 210 matching lines @@
   if (!player)
     return;
   player->Start();
   if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
     video_view_->OpenVideo();
     fullscreen_player_is_released_ = false;
   }
 }
 
 }  // namespace content