Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / zoom / zoom_controller_unittest.cc

diff --git a/src/chrome/browser/ui/zoom/zoom_controller_unittest.cc b/src/chrome/browser/ui/zoom/zoom_controller_unittest.cc
index 06bdb16..1d468f9 100644 (file)
--- a/src/chrome/browser/ui/zoom/zoom_controller_unittest.cc
+++ b/src/chrome/browser/ui/zoom/zoom_controller_unittest.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/host_zoom_map.h"
@@ -36,7 +35,7 @@ class TestZoomObserver : public ZoomObserver {
 
 class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() OVERRIDE {
+  void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     zoom_controller_.reset(new ZoomController(web_contents()));
     zoom_controller_->AddObserver(&zoom_observer_);
@@ -47,7 +46,7 @@ class ZoomControllerTest : public ChromeRenderViewHostTestHarness {
         base::string16(), MSG_ROUTING_NONE, MSG_ROUTING_NONE, -1, false);
   }
 
-  virtual void TearDown() OVERRIDE {
+  void TearDown() override {
     zoom_controller_->RemoveObserver(&zoom_observer_);
     zoom_controller_.reset();
     ChromeRenderViewHostTestHarness::TearDown();