| Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| index 54e642a30861ff711d222a1779cb8108a0a20120..c12ddf5e797c34c14bde44bb9210a937303fd195 100644
|
| --- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| +++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
|
| @@ -5,9 +5,9 @@
|
| #include "ash/wm/dock/docked_window_layout_manager.h"
|
|
|
| #include "ash/ash_switches.h"
|
| -#include "ash/launcher/launcher.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/screen_ash.h"
|
| +#include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| #include "ash/shelf/shelf_model.h"
|
| #include "ash/shelf/shelf_types.h"
|
| @@ -15,7 +15,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/shelf_test_api.h"
|
| #include "ash/test/shelf_view_test_api.h"
|
| #include "ash/test/shell_test_api.h"
|
| #include "ash/test/test_shelf_delegate.h"
|
| @@ -53,7 +53,7 @@ class DockedWindowLayoutManagerTest
|
| ASSERT_TRUE(test::TestShelfDelegate::instance());
|
|
|
| shelf_view_test_.reset(new test::ShelfViewTestAPI(
|
| - test::LauncherTestAPI(Launcher::ForPrimaryDisplay()).shelf_view()));
|
| + test::ShelfTestAPI(Shelf::ForPrimaryDisplay()).shelf_view()));
|
| shelf_view_test_->SetAnimationDuration(1);
|
| }
|
|
|
|
|