summaryrefslogtreecommitdiffstats
path: root/extensions/shell/test
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:32:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:32:37 +0000
commit0eac4e1becc07e32503722d9ffd421cf8c8688e3 (patch)
treeb8777ad781ca887318c7760bb7380fd662497558 /extensions/shell/test
parentc0fd0633fb72a4e71acaf09f47202c8b8225a015 (diff)
downloadchromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.zip
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.gz
chromium_src-0eac4e1becc07e32503722d9ffd421cf8c8688e3.tar.bz2
replace OVERRIDE and FINAL with override and final in extensions/
BUG=417463 Review URL: https://codereview.chromium.org/622343002 Cr-Commit-Position: refs/heads/master@{#298042}
Diffstat (limited to 'extensions/shell/test')
-rw-r--r--extensions/shell/test/shell_test.h6
-rw-r--r--extensions/shell/test/shell_test_launcher_delegate.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/extensions/shell/test/shell_test.h b/extensions/shell/test/shell_test.h
index ac7ad78..29e1f25 100644
--- a/extensions/shell/test/shell_test.h
+++ b/extensions/shell/test/shell_test.h
@@ -28,9 +28,9 @@ class AppShellTest : public content::BrowserTestBase {
virtual ~AppShellTest();
// content::BrowserTestBase implementation.
- virtual void SetUp() OVERRIDE;
- virtual void SetUpOnMainThread() OVERRIDE;
- virtual void RunTestOnMainThreadLoop() OVERRIDE;
+ virtual void SetUp() override;
+ virtual void SetUpOnMainThread() override;
+ virtual void RunTestOnMainThreadLoop() override;
content::BrowserContext* browser_context() { return browser_context_; }
diff --git a/extensions/shell/test/shell_test_launcher_delegate.h b/extensions/shell/test/shell_test_launcher_delegate.h
index 8e62f5d..c6fbfdf 100644
--- a/extensions/shell/test/shell_test_launcher_delegate.h
+++ b/extensions/shell/test/shell_test_launcher_delegate.h
@@ -11,11 +11,11 @@ namespace extensions {
class AppShellTestLauncherDelegate : public content::TestLauncherDelegate {
public:
- virtual int RunTestSuite(int argc, char** argv) OVERRIDE;
+ virtual int RunTestSuite(int argc, char** argv) override;
virtual bool AdjustChildProcessCommandLine(
base::CommandLine* command_line,
- const base::FilePath& temp_data_dir) OVERRIDE;
- virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE;
+ const base::FilePath& temp_data_dir) override;
+ virtual content::ContentMainDelegate* CreateContentMainDelegate() override;
};
} // namespace extensions