| 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:
|
|
|