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 e119636da1d705bd4483e79bb96f6f517e22586a..2000b687facc75b3fc90a11e7e013f3cdd2ce630 100644 |
--- a/chrome/browser/media/encrypted_media_browsertest.cc |
+++ b/chrome/browser/media/encrypted_media_browsertest.cc |
@@ -237,7 +237,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest { |
title_watcher->AlsoWaitForTitle(base::ASCIIToUTF16(kEmeKeyError)); |
} |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
#if defined(OS_ANDROID) |
command_line->AppendSwitch( |
switches::kDisableGestureRequirementForMediaPlayback); |
@@ -245,7 +245,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest { |
} |
void SetUpCommandLineForKeySystem(const std::string& key_system, |
- CommandLine* command_line) { |
+ base::CommandLine* command_line) { |
if (GetServerConfig(key_system)) |
// Since the web and license servers listen on different ports, we need to |
// disable web-security to send license requests to the license server. |
@@ -266,7 +266,7 @@ class EncryptedMediaTestBase : public MediaBrowserTest { |
private: |
#if defined(ENABLE_PEPPER_CDMS) |
- void RegisterPepperCdm(CommandLine* command_line, |
+ void RegisterPepperCdm(base::CommandLine* command_line, |
const std::string& adapter_name, |
const std::string& key_system) { |
DCHECK(!is_pepper_cdm_registered_) |
@@ -329,7 +329,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase { |
} |
protected: |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
EncryptedMediaTestBase::SetUpCommandLine(command_line); |
SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); |
} |
@@ -341,7 +341,7 @@ class ECKEncryptedMediaTest : public EncryptedMediaTestBase { |
// enabled by default. |
class ECKUnprefixedEncryptedMediaTest : public EncryptedMediaTestBase { |
protected: |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
EncryptedMediaTestBase::SetUpCommandLine(command_line); |
command_line->AppendSwitch(switches::kEnableEncryptedMedia); |
SetUpCommandLineForKeySystem(kExternalClearKeyKeySystem, command_line); |
@@ -352,7 +352,7 @@ class ECKUnprefixedEncryptedMediaTest : 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(base::CommandLine* command_line) override { |
EncryptedMediaTestBase::SetUpCommandLine(command_line); |
command_line->AppendSwitch(switches::kEnableEncryptedMedia); |
SetUpCommandLineForKeySystem(kWidevineKeySystem, command_line); |
@@ -434,7 +434,7 @@ class EncryptedMediaTest |
} |
protected: |
- void SetUpCommandLine(CommandLine* command_line) override { |
+ void SetUpCommandLine(base::CommandLine* command_line) override { |
EncryptedMediaTestBase::SetUpCommandLine(command_line); |
SetUpCommandLineForKeySystem(CurrentKeySystem(), command_line); |