media: Only unregister a CDM when it has been registered.

media/mojo/services/mojo_cdm_service.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 "media/mojo/services/mojo_cdm_service.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 75 matching lines @@
       context_(context),
       service_provider_(service_provider),
       cdm_factory_(cdm_factory),
       cdm_id_(CdmContext::kInvalidCdmId),
       weak_factory_(this) {
   DCHECK(context_);
   DCHECK(cdm_factory_);
 }
 
 MojoCdmService::~MojoCdmService() {
+  if (cdm_id_ == CdmContext::kInvalidCdmId)
+    return;
+
   g_cdm_manager.Get().UnregisterCdm(cdm_id_);
 
-  if (cdm_id_ != CdmContext::kInvalidCdmId && context_)
+  if (context_)
     context_->UnregisterCdm(cdm_id_);
 }
 
 void MojoCdmService::SetClient(
     interfaces::ContentDecryptionModuleClientPtr client) {
   client_ = std::move(client);
 }
 
 void MojoCdmService::Initialize(const mojo::String& key_system,
                                 const mojo::String& security_origin,
@@ skipping 167 matching lines @@
 
 void MojoCdmService::OnDecryptorConnectionError() {
   DVLOG(2) << __FUNCTION__;
 
   // MojoDecryptorService has lost connectivity to it's client, so it can be
   // freed.
   decryptor_.reset();
 }
 
 }  // namespace media