Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(306)

Side by Side Diff: media/mojo/services/mojo_cdm_service.cc

Issue 2607063002: Remove mojo::Array. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/mojo/services/mojo_cdm_service.h" 5 #include "media/mojo/services/mojo_cdm_service.h"
6 6
7 #include <map> 7 #include <map>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/synchronization/lock.h" 14 #include "base/synchronization/lock.h"
15 #include "media/base/cdm_config.h" 15 #include "media/base/cdm_config.h"
16 #include "media/base/cdm_context.h" 16 #include "media/base/cdm_context.h"
17 #include "media/base/cdm_factory.h" 17 #include "media/base/cdm_factory.h"
18 #include "media/base/cdm_key_information.h" 18 #include "media/base/cdm_key_information.h"
19 #include "media/base/key_systems.h" 19 #include "media/base/key_systems.h"
20 #include "media/mojo/common/media_type_converters.h" 20 #include "media/mojo/common/media_type_converters.h"
21 #include "media/mojo/services/mojo_cdm_service_context.h" 21 #include "media/mojo/services/mojo_cdm_service_context.h"
22 #include "mojo/common/common_type_converters.h"
23 #include "url/gurl.h" 22 #include "url/gurl.h"
24 23
25 namespace media { 24 namespace media {
26 25
27 namespace { 26 namespace {
28 27
29 // Manages all CDMs created by MojoCdmService. Can only have one instance per 28 // Manages all CDMs created by MojoCdmService. Can only have one instance per
30 // process so use a LazyInstance to ensure this. 29 // process so use a LazyInstance to ensure this.
31 class CdmManager { 30 class CdmManager {
32 public: 31 public:
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 249
251 void MojoCdmService::OnDecryptorConnectionError() { 250 void MojoCdmService::OnDecryptorConnectionError() {
252 DVLOG(2) << __func__; 251 DVLOG(2) << __func__;
253 252
254 // MojoDecryptorService has lost connectivity to it's client, so it can be 253 // MojoDecryptorService has lost connectivity to it's client, so it can be
255 // freed. 254 // freed.
256 decryptor_.reset(); 255 decryptor_.reset();
257 } 256 }
258 257
259 } // namespace media 258 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698