| Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| index fe33840001b2e747d622b9f75f6ce816fbf3b524..f457a3a74993f7a69e2e6d76f6980dd119fbb5ab 100644
|
| --- a/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| +++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
|
| @@ -35,12 +35,12 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
|
| public:
|
| ExtensionContentSettingsApiTest() : profile_(NULL) {}
|
|
|
| - virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| + void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| command_line->AppendSwitch(switches::kDisablePluginsDiscovery);
|
| }
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| ExtensionApiTest::SetUpOnMainThread();
|
|
|
| // The browser might get closed later (and therefore be destroyed), so we
|
| @@ -53,7 +53,7 @@ class ExtensionContentSettingsApiTest : public ExtensionApiTest {
|
| g_browser_process->AddRefModule();
|
| }
|
|
|
| - virtual void TearDownOnMainThread() override {
|
| + void TearDownOnMainThread() override {
|
| // ReleaseBrowserProcessModule() needs to be called in a message loop, so we
|
| // post a task to do it, then run the message loop.
|
| base::MessageLoop::current()->PostTask(
|
|
|