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

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 1551163002: Build fix for Pass()→std::move() conversion in EncryptedMediaTestBase (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 316d1ea6018da88e008ea7db81857b715f4902be..738b6d85088225c80aedb3141f040068a0b8dd9a 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -236,13 +236,12 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
const std::string& key_system) {
#if defined(WIDEVINE_CDM_AVAILABLE)
if (IsWidevine(key_system)) {
- scoped_ptr<TestLicenseServerConfig> config =
- scoped_ptr<TestLicenseServerConfig>(new WVTestLicenseServerConfig());
+ scoped_ptr<TestLicenseServerConfig> config(new WVTestLicenseServerConfig);
if (config->IsPlatformSupported())
- return config.Pass();
+ return config;
}
#endif // defined(WIDEVINE_CDM_AVAILABLE)
- return scoped_ptr<TestLicenseServerConfig>();
+ return nullptr;
}
protected:
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698