ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 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/cdm/browser_cdm_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 347 matching lines @@
     default:
       NOTREACHED();
       promise->reject(MediaKeys::INVALID_ACCESS_ERROR, 0,
                       "Invalid init data type.");
       return;
   }
 
 #if defined(OS_ANDROID)
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableInfobarForProtectedMediaIdentifier)) {
-    GenerateRequestIfPermitted(render_frame_id, cdm_id, eme_init_data_type,
-                               init_data, promise.Pass(), true);
+    GenerateRequestIfPermitted(
+        render_frame_id, cdm_id, eme_init_data_type,
+        init_data, promise.Pass(), PERMISSION_STATUS_GRANTED);
     return;
   }
 #endif
 
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     DLOG(WARNING) << "No CDM found for: " << render_frame_id << ", " << cdm_id;
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
@@ skipping 145 matching lines @@
                        render_frame_id, cdm_id, init_data_type, init_data,
                        base::Passed(&promise)));
 }
 
 void BrowserCdmManager::GenerateRequestIfPermitted(
     int render_frame_id,
     int cdm_id,
     media::EmeInitDataType init_data_type,
     const std::vector<uint8>& init_data,
     scoped_ptr<media::NewSessionCdmPromise> promise,
-    bool permitted) {
+    PermissionStatus permission) {
   cdm_cancel_permission_map_.erase(GetId(render_frame_id, cdm_id));
-  if (!permitted) {
+  if (permission != PERMISSION_STATUS_GRANTED) {
     promise->reject(MediaKeys::NOT_SUPPORTED_ERROR, 0, "Permission denied.");
     return;
   }
 
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
@@ skipping 15 matching lines @@
   }
 
   // Only the temporary session type is supported in browser CDM path.
   // TODO(xhwang): Add SessionType support if needed.
   cdm->CreateSessionAndGenerateRequest(media::MediaKeys::TEMPORARY_SESSION,
                                        init_data_type_string, &init_data[0],
                                        init_data.size(), promise.Pass());
 }
 
 }  // namespace content