Simplify/Cleanup MediaClient

android_webview/renderer/aw_content_renderer_client.cc

 // Copyright 2012 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 "android_webview/renderer/aw_content_renderer_client.h"
 
 #include <vector>
 
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
@@ skipping 15 matching lines @@
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/content/renderer/autofill_agent.h"
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/printing/renderer/print_web_view_helper.h"
 #include "components/spellcheck/spellcheck_build_features.h"
 #include "components/supervised_user_error_page/gin_wrapper.h"
 #include "components/supervised_user_error_page/supervised_user_error_page_android.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "components/web_restrictions/interfaces/web_restrictions.mojom.h"
 #include "content/public/common/url_constants.h"
+#include "content/public/renderer/content_media_client.h"
 #include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
+#include "media/base/media_client.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebNavigationType.h"
@@ skipping 24 matching lines @@
   visited_link_slave_.reset(new visitedlink::VisitedLinkSlave);
   thread->GetInterfaceRegistry()->AddInterface(
       visited_link_slave_->GetBindCallback());
 
 #if BUILDFLAG(ENABLE_SPELLCHECK)
   if (!spellcheck_) {
     spellcheck_ = base::MakeUnique<SpellCheck>();
     thread->AddObserver(spellcheck_.get());
   }
 #endif
+
+  ::media::SetMediaClient(new ::content::ContentMediaClient(this));
 }
 
 bool AwContentRendererClient::HandleNavigation(
     content::RenderFrame* render_frame,
     bool is_content_initiated,
     bool render_view_was_created_by_renderer,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
     blink::WebNavigationType type,
     blink::WebNavigationPolicy default_policy,
@@ skipping 174 matching lines @@
     size_t length) {
   return visited_link_slave_->ComputeURLFingerprint(canonical_url, length);
 }
 
 bool AwContentRendererClient::IsLinkVisited(unsigned long long link_hash) {
   return visited_link_slave_->IsVisited(link_hash);
 }
 
 void AwContentRendererClient::AddSupportedKeySystems(
     std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems) {
+  DVLOG(3) << __func__;
   AwAddKeySystems(key_systems);
 }
 
 bool AwContentRendererClient::ShouldUseMediaPlayerForURL(const GURL& url) {
   // Android WebView needs to support codecs that Chrome does not, for these
   // cases we must force the usage of Android MediaPlayer instead of Chrome's
   // internal player.
   //
   // Note: Despite these extensions being forwarded for playback to MediaPlayer,
   // HTMLMediaElement.canPlayType() will return empty for these containers.
   // TODO(boliu): If this is important, extend media::MimeUtil for WebView.
   //
   // Format list mirrors:
   // http://developer.android.com/guide/appendix/media-formats.html
   static const char* kMediaPlayerExtensions[] = {
       ".3gp",  ".ts",    ".flac", ".mid", ".xmf",
       ".mxmf", ".rtttl", ".rtx",  ".ota", ".imy"};
   for (auto* extension : kMediaPlayerExtensions) {
     if (base::EndsWith(url.path(), extension,
                        base::CompareCase::INSENSITIVE_ASCII)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace android_webview