media: Always define |cdm_id| in CdmContext.

media/cdm/aes_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/aes_decryptor.h"
 
 #include <list>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 357 matching lines @@
 }
 
 CdmContext* AesDecryptor::GetCdmContext() {
   return this;
 }
 
 Decryptor* AesDecryptor::GetDecryptor() {
   return this;
 }
 
-#if defined(ENABLE_BROWSER_CDMS)
 int AesDecryptor::GetCdmId() const {
   return kInvalidCdmId;
 }
-#endif  // defined(ENABLE_BROWSER_CDMS)
 
 void AesDecryptor::RegisterNewKeyCB(StreamType stream_type,
                                     const NewKeyCB& new_key_cb) {
   base::AutoLock auto_lock(new_key_cb_lock_);
 
   switch (stream_type) {
     case kAudio:
       new_audio_key_cb_ = new_key_cb;
       break;
     case kVideo:
@@ skipping 138 matching lines @@
 bool AesDecryptor::DecryptionKey::Init() {
   CHECK(!secret_.empty());
   decryption_key_.reset(crypto::SymmetricKey::Import(
       crypto::SymmetricKey::AES, secret_));
   if (!decryption_key_)
     return false;
   return true;
 }
 
 }  // namespace media