Upstream version 7.36.149.0

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

diff --git a/src/ash/shelf/shelf_widget_unittest.cc b/src/ash/shelf/shelf_widget_unittest.cc
index 873cb35..770bd7e 100644 (file)
--- a/src/ash/shelf/shelf_widget_unittest.cc
+++ b/src/ash/shelf/shelf_widget_unittest.cc
@@ -30,7 +30,7 @@ ShelfWidget* GetShelfWidget() {
   return Shelf::ForPrimaryDisplay()->shelf_widget();
 }
 
-internal::ShelfLayoutManager* GetShelfLayoutManager() {
+ShelfLayoutManager* GetShelfLayoutManager() {
   return GetShelfWidget()->shelf_layout_manager();
 }
 
@@ -117,7 +117,7 @@ TEST_F(ShelfWidgetTest, LauncherInitiallySized) {
   ShelfWidget* shelf_widget = GetShelfWidget();
   Shelf* shelf = shelf_widget->shelf();
   ASSERT_TRUE(shelf);
-  internal::ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
+  ShelfLayoutManager* shelf_layout_manager = GetShelfLayoutManager();
   ASSERT_TRUE(shelf_layout_manager);
   ASSERT_TRUE(shelf_widget->status_area_widget());
   int status_width = shelf_widget->status_area_widget()->
@@ -181,7 +181,7 @@ TEST_F(ShelfWidgetTest, ShelfEdgeOverlappingWindowHitTestMouse) {
   ShelfWidget* shelf_widget = GetShelfWidget();
   gfx::Rect shelf_bounds = shelf_widget->GetWindowBoundsInScreen();
   EXPECT_TRUE(!shelf_bounds.IsEmpty());
-  internal::ShelfLayoutManager* shelf_layout_manager =
+  ShelfLayoutManager* shelf_layout_manager =
       shelf_widget->shelf_layout_manager();
   ASSERT_TRUE(shelf_layout_manager);
   EXPECT_EQ(SHELF_VISIBLE, shelf_layout_manager->visibility_state());
@@ -244,7 +244,7 @@ TEST_F(ShelfWidgetTest, HiddenShelfHitTestTouch) {
   ShelfWidget* shelf_widget = GetShelfWidget();
   gfx::Rect shelf_bounds = shelf_widget->GetWindowBoundsInScreen();
   EXPECT_TRUE(!shelf_bounds.IsEmpty());
-  internal::ShelfLayoutManager* shelf_layout_manager =
+  ShelfLayoutManager* shelf_layout_manager =
       shelf_widget->shelf_layout_manager();
   ASSERT_TRUE(shelf_layout_manager);
   EXPECT_EQ(SHELF_VISIBLE, shelf_layout_manager->visibility_state());