Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / shelf / shelf_unittest.cc

diff --git a/src/ash/shelf/shelf_unittest.cc b/src/ash/shelf/shelf_unittest.cc
index 475ee83..87d6b1a 100644 (file)
--- a/src/ash/shelf/shelf_unittest.cc
+++ b/src/ash/shelf/shelf_unittest.cc
@@ -14,10 +14,9 @@
 #include "ash/test/shelf_view_test_api.h"
 #include "ash/test/test_shelf_item_delegate.h"
 #include "ash/wm/window_util.h"
-#include "ui/aura/root_window.h"
+#include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
-#include "ui/views/corewm/corewm_switches.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ -25,8 +24,8 @@
 #include "base/win/windows_version.h"
 #endif
 
-using ash::internal::ShelfView;
-using ash::internal::ShelfButton;
+using ash::ShelfView;
+using ash::ShelfButton;
 
 namespace ash {
 
@@ -38,9 +37,9 @@ class ShelfTest : public ash::test::AshTestBase {
         shelf_model_(NULL),
         item_delegate_manager_(NULL) {}
 
-  virtual ~ShelfTest() {}
+  ~ShelfTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     test::AshTestBase::SetUp();
 
     shelf_ = Shelf::ForPrimaryDisplay();
@@ -55,9 +54,7 @@ class ShelfTest : public ash::test::AshTestBase {
     test_.reset(new ash::test::ShelfViewTestAPI(shelf_view_));
   }
 
-  virtual void TearDown() OVERRIDE {
-    test::AshTestBase::TearDown();
-  }
+  void TearDown() override { test::AshTestBase::TearDown(); }
 
   Shelf* shelf() {
     return shelf_;