Update EME errors to use TypeError

third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

 // 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 "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 39 matching lines @@
     Member<HTMLMediaElement> m_element;
     Member<MediaKeys> m_newMediaKeys;
     bool m_madeReservation;
     Timer<SetMediaKeysHandler> m_timer;
 };
 
 typedef Function<void()> SuccessCallback;
 typedef Function<void(ExceptionCode, const String&)> FailureCallback;
 
 // Represents the result used when setContentDecryptionModule() is called.
-// Calls |success| if result is resolved, |failure| is result is rejected.
+// Calls |success| if result is resolved, |failure| if result is rejected.
 class SetContentDecryptionModuleResult final : public ContentDecryptionModuleResult {
 public:
     SetContentDecryptionModuleResult(std::unique_ptr<SuccessCallback> success, std::unique_ptr<FailureCallback> failure)
         : m_successCallback(std::move(success))
         , m_failureCallback(std::move(failure))
     {
     }
 
     // ContentDecryptionModuleResult implementation.
     void complete() override
@@ skipping 19 matching lines @@
         // is empty, we'll report "Rejected with system code (systemCode)".
         StringBuilder result;
         result.append(message);
         if (systemCode != 0) {
             if (result.isEmpty())
                 result.append("Rejected with system code");
             result.append(" (");
             result.appendNumber(systemCode);
             result.append(')');
         }
+
+        // WebContentDecryptionModuleExceptionTypeError should be reported as
+        // a TypeError, not a DOMException. However, there is no need for a
+        // TypeError when setting/clearing the CDM, so verify that it never
+        // happens.
+        DCHECK_NE(WebContentDecryptionModuleExceptionTypeError, code);

[ddorwin, 2016/09/15 22:43:03]

What would happen if we received this? Would the callback not handle it
correctly? Should the callback be changed instead?

[jrummell, 2016/09/16 23:23:34]

Removed now that haraken@ pointed out a better way to do it (TypeError can be
handled as a DomException).

+
         (*m_failureCallback)(WebCdmExceptionToExceptionCode(code), result.toString());
     }
 
 private:
     std::unique_ptr<SuccessCallback> m_successCallback;
     std::unique_ptr<FailureCallback> m_failureCallback;
 };
 
 ScriptPromise SetMediaKeysHandler::create(ScriptState* scriptState, HTMLMediaElement& element, MediaKeys* mediaKeys)
 {
@@ skipping 300 matching lines @@
 }
 
 DEFINE_TRACE(HTMLMediaElementEncryptedMedia)
 {
     visitor->trace(m_mediaElement);
     visitor->trace(m_mediaKeys);
     Supplement<HTMLMediaElement>::trace(visitor);
 }
 
 } // namespace blink