Index: chrome/browser/content_settings/content_settings_browsertest.cc |
diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc |
index 3ec5e39324deed9ab6346525b38ee6a18c4dd97f..2c4bc273d65ed3f9b3de4e2ab70be4f7b8c4baa0 100644 |
--- a/chrome/browser/content_settings/content_settings_browsertest.cc |
+++ b/chrome/browser/content_settings/content_settings_browsertest.cc |
@@ -53,7 +53,7 @@ class ContentSettingsTest : public InProcessBrowserTest { |
base::FilePath(FILE_PATH_LITERAL("chrome/test/data"))) { |
} |
- virtual void SetUpOnMainThread() OVERRIDE { |
+ virtual void SetUpOnMainThread() override { |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true)); |
@@ -299,7 +299,7 @@ class ClickToPlayPluginTest : public ContentSettingsTest { |
ClickToPlayPluginTest() {} |
#if defined(OS_MACOSX) |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
base::FilePath plugin_dir; |
PathService::Get(base::DIR_MODULE, &plugin_dir); |
plugin_dir = plugin_dir.AppendASCII("plugins"); |
@@ -470,7 +470,7 @@ class PepperContentSettingsSpecialCasesTest : public ContentSettingsTest { |
static const char* const kExternalClearKeyMimeType; |
// Registers any CDM plugins not registered by default. |
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
+ virtual void SetUpCommandLine(CommandLine* command_line) override { |
#if defined(ENABLE_PEPPER_CDMS) |
// Platform-specific filename relative to the chrome executable. |
#if defined(OS_WIN) |
@@ -618,7 +618,7 @@ PepperContentSettingsSpecialCasesTest::kExternalClearKeyMimeType = |
class PepperContentSettingsSpecialCasesPluginsBlockedTest |
: public PepperContentSettingsSpecialCasesTest { |
public: |
- virtual void SetUpOnMainThread() OVERRIDE { |
+ virtual void SetUpOnMainThread() override { |
PepperContentSettingsSpecialCasesTest::SetUpOnMainThread(); |
browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_BLOCK); |
@@ -628,7 +628,7 @@ class PepperContentSettingsSpecialCasesPluginsBlockedTest |
class PepperContentSettingsSpecialCasesJavaScriptBlockedTest |
: public PepperContentSettingsSpecialCasesTest { |
public: |
- virtual void SetUpOnMainThread() OVERRIDE { |
+ virtual void SetUpOnMainThread() override { |
PepperContentSettingsSpecialCasesTest::SetUpOnMainThread(); |
browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
CONTENT_SETTINGS_TYPE_PLUGINS, CONTENT_SETTING_ALLOW); |