media: Fix permission request/check for EME on Android.

media/cdm/proxy_decryptor.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 "media/cdm/proxy_decryptor.h"
 
 #include <cstring>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 115 matching lines @@
 
   // No permission required when AesDecryptor is used or when the key system is
   // external clear key.
   DCHECK(!key_system_.empty());
   if (CanUseAesDecryptor(key_system_) || IsExternalClearKey(key_system_)) {
     OnPermissionStatus(session_type, init_data_type, init_data_vector,
                        promise.Pass(), true /* granted */);
     return true;
   }
 
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
   media_permission_->RequestPermission(
       MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin_,
       base::Bind(&ProxyDecryptor::OnPermissionStatus,
                  weak_ptr_factory_.GetWeakPtr(), session_type, init_data_type,
                  init_data_vector, base::Passed(&promise)));
 #else
-  // TODO(xhwang): Fix the Android path by requesting permission for key systems
-  // that don't use AesDecryptor in M43.
   OnPermissionStatus(session_type, init_data_type, init_data_vector,
                      promise.Pass(), true /* granted */);
 #endif
 
   return true;
 }
 
 void ProxyDecryptor::OnPermissionStatus(
     MediaKeys::SessionType session_type,
     const std::string& init_data_type,
     const std::vector<uint8>& init_data,
     scoped_ptr<NewSessionCdmPromise> promise,
     bool granted) {
   // ProxyDecryptor is only used by Prefixed EME, where RequestPermission() is
   // only for triggering the permission UI. Later CheckPermission() will be
-  // called (e.g. in PlatformVerificationFlow) and the permission status will be
-  // evaluated there.
+  // called (e.g. in PlatformVerificationFlow on ChromeOS; in BrowserCdmManager
+  // on Android) and the permission status will be evaluated then.
   DVLOG_IF(1, !granted) << "Permission request rejected.";
 
   const uint8* init_data_vector_data =
       (init_data.size() > 0) ? &init_data[0] : nullptr;
 
   media_keys_->CreateSessionAndGenerateRequest(
       session_type, init_data_type, init_data_vector_data, init_data.size(),
       promise.Pass());
 }
 
@@ skipping 174 matching lines @@
   bool is_persistent =
       session_type == PersistentSession || session_type == LoadSession;
   active_sessions_.insert(std::make_pair(session_id, is_persistent));
 
   // For LoadSession(), generate the KeyAdded event.
   if (session_type == LoadSession)
     GenerateKeyAdded(session_id);
 }
 
 }  // namespace media