Pass Chrome user agent string to Android media player

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 "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_demuxer_android.h"
 #include "content/browser/media/android/media_resource_getter_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
+#include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_source_player.h"
 #include "media/base/media_switches.h"
 
 using media::MediaDrmBridge;
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
@@ skipping 38 matching lines @@
     MediaPlayerHostMsg_Initialize_Type type,
     int player_id,
     const GURL& url,
     const GURL& first_party_for_cookies,
     int demuxer_client_id,
     bool hide_url_log,
     MediaPlayerManager* manager,
     BrowserDemuxerAndroid* demuxer) {
   switch (type) {
     case MEDIA_PLAYER_TYPE_URL: {
+      const std::string& user_agent = GetUserAgent(url);

[bulach, 2014/01/09 14:23:02]

nit: keep a string value rather than a reference

[xhwang, 2014/01/09 17:51:14]

Based on the documentation:
https://code.google.com/p/chromium/codesearch#chromium/src/content/public/com...

"SetContentClient() must be called prior to calling this..."

Do you know where we called SetContentClient()?

[Jinsuk Kim, 2014/01/10 01:19:13]

Done.

[Jinsuk Kim, 2014/01/10 01:19:13]

It's called when Chrome is initialized in
ChromeMainDelegate::BasicStartupComplete. For ChromiumWebView, it's called in
AwMainDelegate::BasicStartupComplete.

       MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge(
-          player_id, url, first_party_for_cookies, hide_url_log, manager);
+          player_id,
+          url,
+          first_party_for_cookies,
+          user_agent,
+          hide_url_log,
+          manager);
       BrowserMediaPlayerManager* browser_media_player_manager =
           static_cast<BrowserMediaPlayerManager*>(manager);
       ContentViewCoreImpl* content_view_core_impl =
           static_cast<ContentViewCoreImpl*>(ContentViewCore::FromWebContents(
               browser_media_player_manager->web_contents_));
       if (!content_view_core_impl) {
         // May reach here due to prerendering. Don't extract the metadata
         // since it is expensive.
         // TODO(qinmin): extract the metadata once the user decided to load
         // the page.
@@ skipping 693 matching lines @@
   if (pending_fullscreen_player_id_ != media_keys_id)
     return;
 
   pending_fullscreen_player_id_ = -1;
   MediaPlayerAndroid* player = GetPlayer(media_keys_id);
   if (player->IsPlaying())
     OnProtectedSurfaceRequested(media_keys_id);
 }
 
 }  // namespace content