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

Side by Side Diff: media/base/android/browser_cdm_factory_android.cc

Issue 643093003: Use scoped_ptr::Pass instead of scoped_ptr::PassAs<T>. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « no previous file | media/base/pipeline_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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
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
OLDNEW
« no previous file with comments | « no previous file | media/base/pipeline_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698