| Index: ash/shelf/shelf_layout_manager_unittest.cc
|
| diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
|
| index 9217b2af49566fb37607c517a3474708eb31e333..81ecc9fc8237e4a568837fc98ba8aea94344c144 100644
|
| --- a/ash/shelf/shelf_layout_manager_unittest.cc
|
| +++ b/ash/shelf/shelf_layout_manager_unittest.cc
|
| @@ -47,8 +47,6 @@
|
| #endif
|
|
|
| namespace ash {
|
| -namespace internal {
|
| -
|
| namespace {
|
|
|
| void StepWidgetLayerAnimatorToEnd(views::Widget* widget) {
|
| @@ -1015,8 +1013,7 @@ TEST_F(ShelfLayoutManagerTest, VisibleWhenLockScreenShowing) {
|
| GetShelfWidget()->GetWindowBoundsInScreen().y());
|
|
|
| aura::Window* lock_container = Shell::GetContainer(
|
| - Shell::GetPrimaryRootWindow(),
|
| - internal::kShellWindowId_LockScreenContainer);
|
| + Shell::GetPrimaryRootWindow(), kShellWindowId_LockScreenContainer);
|
|
|
| views::Widget* lock_widget = new views::Widget;
|
| views::Widget::InitParams lock_params(
|
| @@ -2056,5 +2053,4 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_StatusAreaHitBoxCoversEdge) {
|
| EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
|
| }
|
|
|
| -} // namespace internal
|
| } // namespace ash
|
|
|