Add --mediadrm-enable-non-compositing flag for Chrome on Android.

content/browser/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/android/browser_media_player_manager.h"
 
+#include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_resource_getter_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/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 "media/base/android/media_drm_bridge.h"
+#include "media/base/media_switches.h"
 
 using media::MediaDrmBridge;
 using media::MediaPlayerAndroid;
 
 // Threshold on the number of media players per renderer before we start
 // attempting to release inactive media players.
 static const int kMediaPlayerThreshold = 1;
 
 namespace content {
 
@@ skipping 486 matching lines @@
     if ((*it)->player_id() == player_id) {
       players_.erase(it);
       break;
     }
   }
 }
 
 void BrowserMediaPlayerManager::AddDrmBridge(int media_keys_id,
                                              const std::vector<uint8>& uuid) {
   DCHECK(!GetDrmBridge(media_keys_id));
-  // TODO(qinmin): Pass the security level to MediaDrmBridge instead of using
-  // the default L3.
+  // TODO(xhwang/ddorwin): Pass the security level from key system.
+  std::string security_level = "L3";
+  if (CommandLine::ForCurrentProcess()
+          ->HasSwitch(switches::kMediaDrmEnableNonCompositing)) {
+    security_level = "L1";
+  }
+
   scoped_ptr<MediaDrmBridge> drm_bridge(
-      MediaDrmBridge::Create(media_keys_id, uuid, "L3", this));
+      MediaDrmBridge::Create(media_keys_id, uuid, security_level, this));

[qinmin, 2013/09/09 22:23:05]

the java side MediaDrmBridge.Create() call will return a non-null object if
SetProperty(L1) fails.
If we want to enforce L1, it should return NULL.

[xhwang, 2013/09/09 22:52:48]

Since last CL
(https://codereview.chromium.org/23480036/diff/45001/media/base/android/java/s...),
MediaDrmBridge.Create() returns NULL when SetProperty(L1) fails.

   if (!drm_bridge) {
     DVLOG(1) << "failed to create drm bridge.";
+    OnKeyError(media_keys_id, "", media::MediaKeys::kUnknownError, 0);
     return;
   }
 
   drm_bridges_.push_back(drm_bridge.release());
 }
 
 void BrowserMediaPlayerManager::RemoveDrmBridge(int media_keys_id) {
   for (ScopedVector<MediaDrmBridge>::iterator it = drm_bridges_.begin();
       it != drm_bridges_.end(); ++it) {
     if ((*it)->media_keys_id() == media_keys_id) {
@@ skipping 10 matching lines @@
   if (!player || !drm_bridge) {
     DVLOG(1) << "OnSetMediaKeys(): Player and MediaKeys must be present.";
     return;
   }
   // TODO(qinmin): add the logic to decide whether we should create the
   // fullscreen surface for EME lv1.
   player->SetDrmBridge(drm_bridge);
 }
 
 }  // namespace content