| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| index 4500e99d61b2c133196bc118ed81a8b7da9922f1..6937aadaff04f6921a1696c1c9805af522217b6b 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| @@ -19,7 +19,6 @@
|
| #include "ash/shell.h"
|
| #include "ash/test/shelf_test_api.h"
|
| #include "ash/test/shelf_view_test_api.h"
|
| -#include "ash/test/shell_test_api.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/macros.h"
|
| @@ -200,9 +199,7 @@ class LauncherPlatformAppBrowserTest
|
| return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
|
| }
|
|
|
| - ash::ShelfModel* shelf_model() {
|
| - return ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();
|
| - }
|
| + ash::ShelfModel* shelf_model() { return ash::WmShell::Get()->shelf_model(); }
|
|
|
| ash::ShelfID CreateAppShortcutLauncherItem(const std::string& name) {
|
| return controller_->CreateAppShortcutLauncherItem(
|
|
|