| 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 31935ee8309025b0099f704de315832b4700a91e..bd6cd7d09f256cc3f1a7c66801b6d7bf1b52e521 100644
|
| --- a/chrome/browser/media/encrypted_media_browsertest.cc
|
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc
|
| @@ -228,13 +228,13 @@ class EncryptedMediaTestBase : public MediaBrowserTest {
|
| scoped_ptr<TestLicenseServer> license_server_;
|
|
|
| // We want to fail quickly when a test fails because an error is encountered.
|
| - virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) OVERRIDE {
|
| + virtual void AddWaitForTitles(content::TitleWatcher* title_watcher) override {
|
| MediaBrowserTest::AddWaitForTitles(title_watcher);
|
| title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeNotSupportedError));
|
| title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError));
|
| }
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| #if defined(OS_ANDROID)
|
| command_line->AppendSwitch(
|
| switches::kDisableGestureRequirementForMediaPlayback);
|
| @@ -326,7 +326,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase {
|
| }
|
|
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| EncryptedMediaTestBase::SetUpCommandLine(command_line);
|
| SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line);
|
| }
|
| @@ -336,7 +336,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase {
|
| // Tests encrypted media playback using Widevine key system.
|
| class WVEncryptedMediaTest : public EncryptedMediaTestBase {
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| EncryptedMediaTestBase::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kEnableEncryptedMedia);
|
| SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line);
|
| @@ -418,7 +418,7 @@ class EncryptedMediaTest
|
| }
|
|
|
| protected:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| EncryptedMediaTestBase::SetUpCommandLine(command_line);
|
| SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line);
|
|
|
|
|