OLD | NEW |
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/base/browser_cdm_factory.h" | 5 #include "media/base/browser_cdm_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
10 #include "media/base/android/media_drm_bridge.h" | 10 #include "media/base/android/media_drm_bridge.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 MediaDrmBridge::SECURITY_LEVEL_3; | 40 MediaDrmBridge::SECURITY_LEVEL_3; |
41 if (CommandLine::ForCurrentProcess()->HasSwitch( | 41 if (CommandLine::ForCurrentProcess()->HasSwitch( |
42 switches::kMediaDrmEnableNonCompositing)) { | 42 switches::kMediaDrmEnableNonCompositing)) { |
43 security_level = MediaDrmBridge::SECURITY_LEVEL_1; | 43 security_level = MediaDrmBridge::SECURITY_LEVEL_1; |
44 } | 44 } |
45 if (!cdm->SetSecurityLevel(security_level)) { | 45 if (!cdm->SetSecurityLevel(security_level)) { |
46 DVLOG(1) << "failed to set security level " << security_level; | 46 DVLOG(1) << "failed to set security level " << security_level; |
47 return scoped_ptr<BrowserCdm>(); | 47 return scoped_ptr<BrowserCdm>(); |
48 } | 48 } |
49 | 49 |
50 return cdm.PassAs<BrowserCdm>(); | 50 return cdm.Pass(); |
51 } | 51 } |
52 | 52 |
53 } // namespace media | 53 } // namespace media |
OLD | NEW |