Refactor: Shelf Widget

ash/launcher/launcher_view_unittest.cc

Index: ash/launcher/launcher_view_unittest.cc
diff --git a/ash/launcher/launcher_view_unittest.cc b/ash/launcher/launcher_view_unittest.cc
index fd8c1f471cda7c7ab443189eb84324016392a445..d0284cf9a711c8939159b8dd6841bd6b29b8efcb 100644
--- a/ash/launcher/launcher_view_unittest.cc
+++ b/ash/launcher/launcher_view_unittest.cc
@@ -13,6 +13,7 @@
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/root_window_controller.h"
+#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ -174,12 +175,13 @@ TEST_F(LauncherViewIconObserverTest, MAYBE_AddRemoveWithMultipleDisplays) {
 }
 
 TEST_F(LauncherViewIconObserverTest, BoundsChanged) {
+  ShelfWidget* shelf = Shell::GetPrimaryRootWindowController()->shelf();
   Launcher* launcher = Launcher::ForPrimaryDisplay();
-  gfx::Size launcher_size =
-      launcher->widget()->GetWindowBoundsInScreen().size();
-  int total_width = launcher_size.width() / 2;
+  gfx::Size shelf_size =
+      shelf->GetWindowBoundsInScreen().size();
+  int total_width = shelf_size.width() / 2;
   ASSERT_GT(total_width, 0);
-  launcher->SetStatusSize(gfx::Size(total_width, launcher_size.height()));
+  launcher->SetViewBounds(gfx::Rect(0, 0, total_width, shelf_size.height()));
   // No animation happens for LauncherView bounds change.
   EXPECT_TRUE(observer()->change_notified());
   observer()->Reset();