Clear Key CDM should resolve the promise if session not found

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 @@
     pending_requests_.push_back(
         new PendingGenerateKeyRequestData(init_data_type, init_data_vector));
     return;
   }
 
   GenerateKeyRequestInternal(init_data_type, init_data_vector);
 }
 
 // Returns true if |data| is prefixed with |header| and has data after the
 // |header|.
-bool HasHeader(const std::vector<uint8>& data, const std::string& header) {
+static bool HasHeader(const std::vector<uint8>& data,
+                      const std::string& header) {
   return data.size() > header.size() &&
          std::equal(header.begin(), header.end(), data.begin());
 }
 
 // Removes the first |length| items from |data|.
-void StripHeader(std::vector<uint8>& data, size_t length) {
+static void StripHeader(std::vector<uint8>& data, size_t length) {
   data.erase(data.begin(), data.begin() + length);
 }
 
 void ProxyDecryptor::GenerateKeyRequestInternal(
     EmeInitDataType init_data_type,
     const std::vector<uint8>& init_data) {
   DVLOG(1) << __FUNCTION__;
   DCHECK(!is_creating_cdm_);
 
   if (!media_keys_) {
@@ skipping 231 matching lines @@
       // This will include all other CDM4 errors and any error generated
       // by CDM5 or later.
       error_code = MediaKeys::kUnknownError;
       break;
   }
   key_error_cb_.Run(session_id, error_code, system_code);
 }
 
 void ProxyDecryptor::SetSessionId(SessionCreationType session_type,
                                   const std::string& session_id) {
+  // LoadSession() returns empty |session_id| if the session is not found, so
+  // convert this into an error.
+  if (session_type == LoadSession && session_id.empty()) {
+    OnLegacySessionError(session_id, MediaKeys::INVALID_ACCESS_ERROR, 0,
+                         "Incorrect session id specified for LoadSession().");

[ddorwin, 2015/07/10 00:35:12]

* s/Incorrect/Unknown/ or something like that.
* LoadSession() is not something the developer knows about.
 - It turns out the message isn't used, so I guess it doesn't matter.

+    return;
+  }
+
   // Loaded sessions are considered persistent.
   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