Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
index 2006aa1c9b4966429feadeaf9e2d7ef27adad6ad..8e6008e1958298b32dffb08b165b75850f503ab8 100644 |
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc |
@@ -15,6 +15,7 @@ |
#include "ash/shelf/shelf_util.h" |
#include "ash/shelf/shelf_view.h" |
#include "ash/shell.h" |
+#include "ash/test/app_list_controller_test_api.h" |
#include "ash/test/launcher_test_api.h" |
#include "ash/test/shelf_view_test_api.h" |
#include "ash/test/shell_test_api.h" |
@@ -1563,7 +1564,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, DragAndDrop) { |
EXPECT_TRUE(service->IsAppListVisible()); |
app_list::AppsGridView* grid_view = |
- app_list::AppsGridView::GetLastGridViewForTest(); |
+ ash::test::AppListControllerTestApi(ash::Shell::GetInstance()). |
+ GetRootGridView(); |
ASSERT_TRUE(grid_view); |
ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test()); |
@@ -1779,9 +1781,11 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, ClickItem) { |
EXPECT_TRUE(service->IsAppListVisible()); |
app_list::AppsGridView* grid_view = |
- app_list::AppsGridView::GetLastGridViewForTest(); |
+ ash::test::AppListControllerTestApi(ash::Shell::GetInstance()). |
+ GetRootGridView(); |
ASSERT_TRUE(grid_view); |
const views::ViewModel* vm_grid = grid_view->view_model_for_test(); |
+ LOG(ERROR) << "vm_grid->view_size=" << vm_grid->view_size(); |
stevenjb
2013/10/22 18:34:27
VLOG (or remove)
jennyz
2013/10/22 18:55:36
Done.
|
EXPECT_EQ(2, vm_grid->view_size()); |
gfx::Rect bounds_grid_1 = vm_grid->view_at(1)->GetBoundsInScreen(); |
// Test now that a click does create a new application tab. |