| Index: chrome/browser/extensions/app_background_page_apitest.cc
|
| diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
|
| index 0f2b4904131fc402469c0e71ffcc930ee222fcab..3362922bb5490ffaf487848a4888b1d2ae3c1c1e 100644
|
| --- a/chrome/browser/extensions/app_background_page_apitest.cc
|
| +++ b/chrome/browser/extensions/app_background_page_apitest.cc
|
| @@ -42,7 +42,7 @@ using extensions::Extension;
|
|
|
| class AppBackgroundPageApiTest : public ExtensionApiTest {
|
| public:
|
| - virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kDisablePopupBlocking);
|
| command_line->AppendSwitch(extensions::switches::kAllowHTTPBackgroundPage);
|
| @@ -129,7 +129,7 @@ class AppBackgroundPageNaClTest : public AppBackgroundPageApiTest {
|
| virtual ~AppBackgroundPageNaClTest() {
|
| }
|
|
|
| - virtual void SetUpOnMainThread() OVERRIDE {
|
| + virtual void SetUpOnMainThread() override {
|
| AppBackgroundPageApiTest::SetUpOnMainThread();
|
| #if !defined(DISABLE_NACL)
|
| nacl::NaClProcessHost::SetPpapiKeepAliveThrottleForTesting(50);
|
|
|