summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/lazy_background_page_apitest.cc
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 17:40:32 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-04 00:40:55 +0000
commita15bee143f21dcc0fb91b8b7f81848a7e51a38bb (patch)
tree10b6e06058381b392a2e0147360afea9de38b36b /chrome/browser/extensions/lazy_background_page_apitest.cc
parente7c9f7781cbc6db099dacbefdc19ac2fd9bfc19a (diff)
downloadchromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.zip
chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.gz
chromium_src-a15bee143f21dcc0fb91b8b7f81848a7e51a38bb.tar.bz2
replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/
BUG=417463 Review URL: https://codereview.chromium.org/624153002 Cr-Commit-Position: refs/heads/master@{#298134}
Diffstat (limited to 'chrome/browser/extensions/lazy_background_page_apitest.cc')
-rw-r--r--chrome/browser/extensions/lazy_background_page_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index 945fbb7..ffa3c95 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -64,7 +64,7 @@ class LoadedIncognitoObserver : public extensions::ExtensionRegistryObserver {
virtual void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE {
+ extensions::UnloadedExtensionInfo::Reason reason) override {
original_complete_.reset(new LazyBackgroundObserver(profile_));
incognito_complete_.reset(
new LazyBackgroundObserver(profile_->GetOffTheRecordProfile()));
@@ -85,7 +85,7 @@ class LazyBackgroundPageApiTest : public ExtensionApiTest {
LazyBackgroundPageApiTest() {}
virtual ~LazyBackgroundPageApiTest() {}
- virtual void SetUpOnMainThread() OVERRIDE {
+ virtual void SetUpOnMainThread() override {
ExtensionApiTest::SetUpOnMainThread();
// Set shorter delays to prevent test timeouts.
extensions::ProcessManager::SetEventPageIdleTimeForTesting(1);