[M120 Migration][MM] Pass |user_agent| instead of WebContents during MediaPlayer...

This is to avoid dependency on //content in //media/filters
for resolving DA build errors for tizen 6.0.

Reference:
https://review.tizen.org/gerrit/#/c/295064/

Change-Id: I01d5d57075b734e15394624e6572ff11cbae1d04
Signed-off-by: Sun-woo Nam <sunny.nam@samsung.com>

diff --git a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
index 27f49320f56bcbde43974aae2a2f2d50aa9135c5..c502b700ca7f25823f1c35b9cbbe8a4f5c477992 100644 (file)
--- a/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
+++ b/tizen_src/chromium_impl/content/browser/media/tizen_renderer_impl.cc
@@ -136,9 +136,16 @@ void TizenRendererImpl::Initialize(media::MediaResource* media_resource,
   init_cb_ = std::move(init_cb);
   media_resource_ = media_resource;
 
+  std::string user_agent;
+  if (web_contents_) {
+    user_agent = web_contents_->GetUserAgentOverride().ua_string_override;
+    if (user_agent.empty())
+      user_agent = content::GetContentClientExport()->browser()->GetUserAgent();
+  }
+
   // Create a media player and get player id for the created media player.
   media_player_ = media::MediaPlayerRegistry::GetInstance()->CreateMediaPlayer(
-      media_resource_, web_contents_, volume_, player_id_);
+      media_resource_, user_agent, volume_, player_id_);
 
   if (!media_player_->CreatePlayer(player_id_)) {
     media::MediaPlayerRegistry::GetInstance()->UnregisterMediaPlayer(

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
index fa585d8723c1d5e2838ee1d74085b294c28f7431..837352d9ba6bb9e37796e2c0490755c6cd238365 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.cc
@@ -99,7 +99,7 @@ static void InterruptCb(player_interrupted_code_e code, void* data) {
 namespace media {
 
 MediaPlayerBridgeCapi::MediaPlayerBridgeCapi(const GURL& url,
-                                             std::string& user_agent,
+                                             const std::string& user_agent,
                                              double volume)
     : task_runner_(base::SingleThreadTaskRunner::GetCurrentDefault()),
       delayed_player_state_(PLAYER_STATE_DELAYED_NULL),

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
index b7213ac1ed7d4e202c895400e4dacdd37e4525d5..a3c7f2779c9cb73dcdddb55b29f511f8d4940c0b 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi.h
@@ -46,7 +46,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi : public MediaPlayerTizen {
   typedef base::OnceCallback<void(const bool)> CompleteCB;
 
   MediaPlayerBridgeCapi(const GURL& url,
-                        std::string& user_agent,
+                        const std::string& user_agent,
                         double volume);
   MediaPlayerBridgeCapi(const MediaPlayerBridgeCapi&) = delete;
   MediaPlayerBridgeCapi& operator=(const MediaPlayerBridgeCapi&) = delete;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc
index 3cb4af7e5615b02e3c2f43a782c89db08caaba1f..45b30442bd1745621dee4d8365548ecbd3975383 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.cc
@@ -4,9 +4,6 @@
 
 #include "tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h"
 
-#include "content/common/content_client_export.h"
-#include "content/public/browser/content_browser_client.h"
-#include "content/public/browser/web_contents.h"
 #include "media/base/media_resource.h"
 #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
 #if BUILDFLAG(IS_TIZEN_TV)
@@ -19,15 +16,8 @@ namespace media {
 
 std::unique_ptr<MediaPlayerTizen> MediaPlayerBridgeCapiFactory::Create(
     MediaResource* media_resource,
-    content::WebContents* web_contents,
+    const std::string& user_agent,
     double volume) {
-  std::string user_agent;
-  if (web_contents) {
-    user_agent = web_contents->GetUserAgentOverride().ua_string_override;
-    if (user_agent.empty()) {
-      user_agent = content::GetContentClientExport()->browser()->GetUserAgent();
-    }
-  }
 #if BUILDFLAG(IS_TIZEN_TV)
   return std::make_unique<MediaPlayerBridgeCapiTV>(
       media_resource->GetMediaUrlParams().media_url, user_agent, volume);

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h
index cdf9177db89f2c2ac13bb664067c097863e8c063..e9dbfac73e0c9fa30f729678a1ffcdedc67b588f 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_factory.h
@@ -20,7 +20,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapiFactory : public MediaPlayerFactory {
   ~MediaPlayerBridgeCapiFactory() override = default;
 
   std::unique_ptr<MediaPlayerTizen> Create(MediaResource* media_resource,
-                                           content::WebContents* web_contents,
+                                           const std::string& user_agent,
                                            double volume) override;
 };
 

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
index 5b79cef8a1984584f4cc1e482d9e086ced6192be..7cfb666f103e6b3d6588cb109196a1ed88b08afb 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.cc
@@ -13,7 +13,7 @@ const int kSeekableTimeUpdateInterval = 500;
 namespace media {
 
 MediaPlayerBridgeCapiTV::MediaPlayerBridgeCapiTV(const GURL& url,
-                                                 std::string& user_agent,
+                                                 const std::string& user_agent,
                                                  double volume)
     : MediaPlayerBridgeCapi(url, user_agent, volume), weak_factory_(this) {
   LOG(INFO) << "(" << static_cast<void*>(this) << ") " << __func__;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
index c00923194857e5117c17ffa2660f1cc9536869b2..b6c5a16fdac972dfbcb6994a0ad09553ca899ee8 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_bridge_capi_tv.h
@@ -15,7 +15,7 @@ namespace media {
 class MEDIA_EXPORT MediaPlayerBridgeCapiTV : public MediaPlayerBridgeCapi {
  public:
   MediaPlayerBridgeCapiTV(const GURL& url,
-                          std::string& user_agent,
+                          const std::string& user_agent,
                           double volume);
   ~MediaPlayerBridgeCapiTV() override;
 

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc
index 42704dcf46e8947cb5535c9e1bc130dcf175536d..f3b2fc98637af33ad7ade466ceafb746febae356 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.cc
@@ -15,7 +15,7 @@ namespace media {
 
 std::unique_ptr<MediaPlayerTizen> MediaPlayerESPlusPlayerFactory::Create(
     MediaResource* media_resource,
-    content::WebContents* web_contents,
+    const std::string& user_agent,
     double volume) {
 #if BUILDFLAG(IS_TIZEN_TV)
   return std::make_unique<MediaPlayerESPlusPlayerTV>();

diff --git a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h
index f973199b3848e078e72cb2c1dd28e0c4a60ff1af..44a3c1f90bf22b8587003767dd974a5347b25d7e 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_esplusplayer_factory.h
@@ -19,10 +19,9 @@ class MEDIA_EXPORT MediaPlayerESPlusPlayerFactory : public MediaPlayerFactory {
  public:
   ~MediaPlayerESPlusPlayerFactory() override = default;
 
-  std::unique_ptr<MediaPlayerTizen> Create(
-      MediaResource* /*media_resource*/,
-      content::WebContents* /*web_contents*/,
-      double /*volume*/) override;
+  std::unique_ptr<MediaPlayerTizen> Create(MediaResource* /*media_resource*/,
+                                           const std::string& /*user_agent*/,
+                                           double /*volume*/) override;
 };
 
 }  // namespace media

diff --git a/tizen_src/chromium_impl/media/filters/media_player_factory.h b/tizen_src/chromium_impl/media/filters/media_player_factory.h
index efb2589278df0220bd99a795e7ca54c0340815aa..e5cc48dec2a88301d82d2d1687d9941038069504 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_factory.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_factory.h
@@ -9,10 +9,6 @@
 
 #include "media/base/media_export.h"
 
-namespace content {
-class WebContents;
-}  // namespace content
-
 namespace media {
 
 class MediaPlayerTizen;
@@ -24,7 +20,7 @@ class MEDIA_EXPORT MediaPlayerFactory {
 
   virtual std::unique_ptr<MediaPlayerTizen> Create(
       MediaResource* media_resource,
-      content::WebContents* web_contents,
+      const std::string& user_agent,
       double volume) = 0;
 };
 

diff --git a/tizen_src/chromium_impl/media/filters/media_player_registry.cc b/tizen_src/chromium_impl/media/filters/media_player_registry.cc
index 4974992d303c1dbc84dec3471e0dfb85b309c420..e8f55b8d29031ba39f25c782efd025838396cc6e 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_registry.cc
+++ b/tizen_src/chromium_impl/media/filters/media_player_registry.cc
@@ -24,7 +24,7 @@ MediaPlayerRegistry::~MediaPlayerRegistry() {}
 
 std::unique_ptr<MediaPlayerTizen> MediaPlayerRegistry::CreateMediaPlayer(
     MediaResource* media_resource,
-    content::WebContents* web_contents,
+    const std::string& user_agent,
     double volume,
     int& player_id) {
   LOG(INFO) << __func__;
@@ -35,7 +35,7 @@ std::unique_ptr<MediaPlayerTizen> MediaPlayerRegistry::CreateMediaPlayer(
     // media_resource->GetType() == MediaResource::Type::KUrl
     factory = std::make_unique<MediaPlayerBridgeCapiFactory>();
   }
-  auto player = factory->Create(media_resource, web_contents, volume);
+  auto player = factory->Create(media_resource, user_agent, volume);
   player_id = RegisterMediaPlayer(player.get());
   return player;
 }

diff --git a/tizen_src/chromium_impl/media/filters/media_player_registry.h b/tizen_src/chromium_impl/media/filters/media_player_registry.h
index ff0b90849f2ffbfa1d6cbcc2eeda9ee654d79176..29a051f5c1809fb077089f1ff2b947633a702b7c 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_registry.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_registry.h
@@ -12,10 +12,6 @@
 #include "media/filters/longest_conflict_strategy.h"
 #include "media/filters/media_capability_manager.h"
 
-namespace content {
-class WebContents;
-}
-
 namespace media {
 
 class MediaPlayerTizen;
@@ -30,7 +26,7 @@ class MEDIA_EXPORT MediaPlayerRegistry {
 
   std::unique_ptr<MediaPlayerTizen> CreateMediaPlayer(
       MediaResource* media_resource,
-      content::WebContents* web_contents,
+      const std::string& user_agent,
       double volume,
       int& player_id);
   int RegisterMediaPlayer(MediaPlayerTizen* player);

diff --git a/tizen_src/chromium_impl/media/filters/media_player_tizen.h b/tizen_src/chromium_impl/media/filters/media_player_tizen.h
index a9a3396df95e9d0a1164c78f424562c2647fd708..defac694e21b1659111b23f2cc5ad0efaa9d758b 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_tizen.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_tizen.h
@@ -51,7 +51,6 @@ class MEDIA_EXPORT MediaPlayerTizen {
   virtual void Initialize(VideoRendererSink* sink) = 0;
   virtual bool IsInitialized() = 0;
   virtual void Prepare() = 0;
-  virtual void PlayerPrepared() {}
   virtual bool IsPrepared() = 0;
   virtual bool CanPrepare() = 0;
   virtual void Release() = 0;

diff --git a/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h b/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
index 1e0c1c860ba01351f36e6a860d56634ecdd11e99..d98b4d912c9d57e4355d6f386b258aef5bae4360 100644 (file)
--- a/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
+++ b/tizen_src/chromium_impl/media/filters/media_player_tizen_client.h
@@ -5,7 +5,6 @@
 #ifndef MEDIA_FILTERS_MEDIA_PLAYER_TIZEN_CLIENT_H_
 #define MEDIA_FILTERS_MEDIA_PLAYER_TIZEN_CLIENT_H_
 
-#include "content/public/browser/web_contents.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder_config.h"