| Index: chrome/browser/ui/zoom/zoom_controller_unittest.cc
|
| diff --git a/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
|
| index 06bdb167c53ef01ee7cb2cc070684c0ff251ab10..4fca4d7717d5390eded9fdb6b10dcf9c7e2bd692 100644
|
| --- a/chrome/browser/ui/zoom/zoom_controller_unittest.cc
|
| +++ b/chrome/browser/ui/zoom/zoom_controller_unittest.cc
|
| @@ -36,7 +36,7 @@ class TestZoomObserver : public ZoomObserver {
|
|
|
| class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
|
| public:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ChromeRenderViewHostTestHarness::SetUp();
|
| zoom_controller_.reset(new ZoomController(web_contents()));
|
| zoom_controller_->AddObserver(&zoom_observer_);
|
| @@ -47,7 +47,7 @@ class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
|
| base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false);
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| zoom_controller_->RemoveObserver(&zoom_observer_);
|
| zoom_controller_.reset();
|
| ChromeRenderViewHostTestHarness::TearDown();
|
|
|