| Index: chrome/browser/extensions/location_bar_controller_unittest.cc
|
| diff --git a/chrome/browser/extensions/location_bar_controller_unittest.cc b/chrome/browser/extensions/location_bar_controller_unittest.cc
|
| index 48c25866ba48987811301633d0e4f35589d8587b..baa17cfc37f4975855f3c1880de7ceb34c1abfd1 100644
|
| --- a/chrome/browser/extensions/location_bar_controller_unittest.cc
|
| +++ b/chrome/browser/extensions/location_bar_controller_unittest.cc
|
| @@ -35,7 +35,7 @@ namespace {
|
|
|
| class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| active_script_override_.reset(new FeatureSwitch::ScopedOverride(
|
| FeatureSwitch::scripts_require_action(), true));
|
|
|
| @@ -54,7 +54,7 @@ class LocationBarControllerUnitTest : public ChromeRenderViewHostTestHarness {
|
| &command_line, base::FilePath(), false);
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| #if defined OS_CHROMEOS
|
| test_user_manager_.reset();
|
| #endif
|
|
|