Added views::ViewModelT<T>, a type-safe template version of ViewModel.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

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 88a475549a175afbb466ca6bb25ac64899822919..23382ad8c73b2fbd6f36ac29e35da6df1febf151 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -1633,7 +1633,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_DragAndDrop) {
   ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
 
   // There should be 2 items in our application list.
-  const views::ViewModel* vm_grid = grid_view->view_model_for_test();
+  const views::ViewModel<app_list::AppListItemView>* vm_grid =
+      grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
 
   // Test #1: Drag an app list which does not exist yet item into the
@@ -1651,7 +1652,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_DragAndDrop) {
   EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
 
   // Drag the item into the shelf and check that a new item gets created.
-  const views::ViewModel* vm_shelf = test.shelf_view()->view_model_for_test();
+  const views::ViewModel<views::View>* vm_shelf =
+      test.shelf_view()->view_model_for_test();
   views::View* shelf1 = vm_shelf->view_at(1);
   gfx::Rect bounds_shelf_1 = shelf1->GetBoundsInScreen();
   generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
@@ -1783,7 +1785,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,
   ASSERT_TRUE(grid_view->has_drag_and_drop_host_for_test());
 
   // There should be 2 items in our application list.
-  const views::ViewModel* vm_grid = grid_view->view_model_for_test();
+  const views::ViewModel<app_list::AppListItemView>* vm_grid =
+      grid_view->view_model_for_test();
   EXPECT_EQ(2, vm_grid->view_size());
 
   // Drag an app list item which does not exist yet in the shelf.
@@ -1802,7 +1805,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,
   EXPECT_FALSE(grid_view->forward_events_to_drag_and_drop_host_for_test());
 
   // Drag the item into the shelf and check that a new item gets created.
-  const views::ViewModel* vm_shelf = test.shelf_view()->view_model_for_test();
+  const views::ViewModel<views::View>* vm_shelf =
+      test.shelf_view()->view_model_for_test();
   views::View* shelf1 = vm_shelf->view_at(1);
   gfx::Rect bounds_shelf_1 = shelf1->GetBoundsInScreen();
   bounds_shelf_1.Offset(-origin.x(), -origin.y());
@@ -1957,7 +1961,8 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ClickItem) {
       ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
           GetRootGridView();
   ASSERT_TRUE(grid_view);
-  const views::ViewModel* vm_grid = grid_view->view_model_for_test();
+  const views::ViewModel<app_list::AppListItemView>* vm_grid =
+      grid_view->view_model_for_test();
   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.