media: Always define |cdm_id| in CdmContext.

content/renderer/media/crypto/ppapi_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 "content/renderer/media/crypto/ppapi_decryptor.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 167 matching lines @@
 }
 
 media::CdmContext* PpapiDecryptor::GetCdmContext() {
   return this;
 }
 
 media::Decryptor* PpapiDecryptor::GetDecryptor() {
   return this;
 }
 
+int PpapiDecryptor::GetCdmId() const {
+  return kInvalidCdmId;

[ddorwin, 2015/01/05 22:59:05]

Should this be NOTREACHED()?

[xhwang, 2015/03/17 23:40:28]

Maybe, but that's very implementation dependent (e.g. the media pipeline always
call GetDecryptor() before GetCdmId()...). I think returning kInvalidCdmId is
more generic.

+}
+
 void PpapiDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                       const NewKeyCB& new_key_cb) {
   if (!render_loop_proxy_->BelongsToCurrentThread()) {
     render_loop_proxy_->PostTask(FROM_HERE,
                                  base::Bind(&PpapiDecryptor::RegisterNewKeyCB,
                                             weak_ptr_factory_.GetWeakPtr(),
                                             stream_type,
                                             new_key_cb));
     return;
   }
@@ skipping 240 matching lines @@
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   pepper_cdm_wrapper_.reset();
 }
 
 ContentDecryptorDelegate* PpapiDecryptor::CdmDelegate() {
   DCHECK(render_loop_proxy_->BelongsToCurrentThread());
   return (pepper_cdm_wrapper_) ? pepper_cdm_wrapper_->GetCdmDelegate() : NULL;
 }
 
 }  // namespace content