[ash] Remove Launcher::GetLauncherViewForTest()

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_icon_observer.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_tooltip_manager.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #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"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ash_resources.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 46 matching lines @@
  public:
   LauncherViewIconObserverTest() {}
   virtual ~LauncherViewIconObserverTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     Launcher* launcher = Launcher::ForPrimaryDisplay();
     observer_.reset(new TestLauncherIconObserver(launcher));
 
     launcher_view_test_.reset(new LauncherViewTestAPI(
-        launcher->GetLauncherViewForTest()));
+        LauncherTestAPI(launcher).launcher_view()));
     launcher_view_test_->SetAnimationDuration(1);
   }
 
   virtual void TearDown() OVERRIDE {
     observer_.reset();
     AshTestBase::TearDown();
   }
 
   TestLauncherIconObserver* observer() { return observer_.get(); }
 
@@ skipping 96 matching lines @@
 class LauncherViewTest : public AshTestBase {
  public:
   LauncherViewTest() : model_(NULL), launcher_view_(NULL), browser_index_(1) {}
   virtual ~LauncherViewTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
     test::ShellTestApi test_api(Shell::GetInstance());
     model_ = test_api.launcher_model();
     Launcher* launcher = Launcher::ForPrimaryDisplay();
-    launcher_view_ = launcher->GetLauncherViewForTest();
+    launcher_view_ = test::LauncherTestAPI(launcher).launcher_view();
 
     // The bounds should be big enough for 4 buttons + overflow chevron.
     launcher_view_->SetBounds(0, 0, 500, 50);
 
     test_api_.reset(new LauncherViewTestAPI(launcher_view_));
     test_api_->SetAnimationDuration(1);  // Speeds up animation for test.
 
     // Add browser shortcut launcher item at index 0 for test.
     AddBrowserShortcut();
   }
@@ skipping 1024 matching lines @@
             test_api_->GetButtonCount());
   gfx::Rect ideal_bounds_0 = test_api_->GetIdealBoundsByIndex(0);
   gfx::Rect ideal_bounds_1 = test_api_->GetIdealBoundsByIndex(1);
   EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, LauncherViewTextDirectionTest, testing::Bool());
 
 }  // namespace test
 }  // namespace ash