[ash] Remove Launcher::GetLauncherViewForTest()

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 0670b445bf99f424256049ed410d47a53fefb643..ae305e9830ffd035a8b19a296237f18724a4d875 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -17,6 +17,7 @@
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/launcher_test_api.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
@@ -50,7 +51,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
     ASSERT_TRUE(test::TestLauncherDelegate::instance());
 
     launcher_view_test_.reset(new test::LauncherViewTestAPI(
-        Launcher::ForPrimaryDisplay()->GetLauncherViewForTest()));
+        GetLauncherView(Launcher::ForPrimaryDisplay())));
     launcher_view_test_->SetAnimationDuration(1);
   }
 
@@ -251,8 +252,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
         RootWindowController::ForWindow(window)->shelf()->
         shelf_layout_manager();
     shelf->SetAutoHideBehavior(behavior);
-    LauncherView* launcher_view =
-        Launcher::ForWindow(window)->GetLauncherViewForTest();
+    LauncherView* launcher_view = GetLauncherView(Launcher::ForWindow(window));
     test::LauncherViewTestAPI test_api(launcher_view);
     test_api.RunMessageLoopUntilAnimationsDone();
   }
@@ -265,6 +265,10 @@ class PanelLayoutManagerTest : public test::AshTestBase {
     shelf->SetState(visibility_state);
   }
 
+  internal::LauncherView* GetLauncherView(Launcher* launcher) {
+    return test::LauncherTestAPI(launcher).launcher_view();
+  }
+
  private:
   scoped_ptr<test::LauncherViewTestAPI> launcher_view_test_;
 
@@ -607,9 +611,9 @@ TEST_F(PanelLayoutManagerTest, PanelMoveBetweenMultipleDisplays) {
   scoped_ptr<aura::Window> p2_d2(CreatePanelWindow(gfx::Rect(600, 0, 50, 50)));
 
   LauncherView* launcher_view_1st =
-      Launcher::ForPrimaryDisplay()->GetLauncherViewForTest();
+      GetLauncherView(Launcher::ForPrimaryDisplay());
   LauncherView* launcher_view_2nd =
-      Launcher::ForWindow(root_windows[1])->GetLauncherViewForTest();
+      GetLauncherView(Launcher::ForWindow(root_windows[1]));
 
   EXPECT_EQ(root_windows[0], p1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow());