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

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

 // Copyright 2013 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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_button.h"
@@ skipping 1615 matching lines @@
   generator.ClickLeftButton();
 
   EXPECT_TRUE(service->IsAppListVisible());
   app_list::AppsGridView* grid_view =
       ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
           GetRootGridView();
   ASSERT_TRUE(grid_view);
   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
   // launcher. Keeping it dragged, see that a new item gets created. Continuing
   // to drag it out should remove it again.
 
   // Get over item #1 of the application list and press the mouse button.
   views::View* item1 = vm_grid->view_at(1);
   gfx::Rect bounds_grid_1 = item1->GetBoundsInScreen();
   generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
                         bounds_grid_1.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
   generator.PressLeftButton();
 
   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(),
                         bounds_shelf_1.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
 
   // Check that a new item got created.
   EXPECT_EQ(3, model_->item_count());
   EXPECT_TRUE(grid_view->forward_events_to_drag_and_drop_host_for_test());
 
@@ skipping 111 matching lines @@
   generator.ClickLeftButton();
 
   EXPECT_TRUE(service->IsAppListVisible());
   app_list::AppsGridView* grid_view =
       ash::test::AppListControllerTestApi(ash::Shell::GetInstance()).
           GetRootGridView();
   ASSERT_TRUE(grid_view);
   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.
   // Keeping it dragged, see that a new item gets created.
   // Continuing to drag it out should remove it again.
 
   // Get over item #1 of the application list and press the mouse button.
   views::View* item1 = vm_grid->view_at(1);
   gfx::Rect bounds_grid_1 = item1->GetBoundsInScreen();
   bounds_grid_1.Offset(-origin.x(), -origin.y());
   generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
                         bounds_grid_1.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
   generator.PressLeftButton();
 
   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());
   generator.MoveMouseTo(bounds_shelf_1.CenterPoint().x(),
                         bounds_shelf_1.CenterPoint().y());
   base::MessageLoop::current()->RunUntilIdle();
 
   // Check that a new item got created.
   EXPECT_EQ(3, model_->item_count());
   EXPECT_TRUE(grid_view->forward_events_to_drag_and_drop_host_for_test());
@@ skipping 134 matching lines @@
   generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
                         app_list_bounds.CenterPoint().y());
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_TRUE(service->IsAppListVisible());
   app_list::AppsGridView* grid_view =
       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.
   TabStripModel* tab_strip = browser()->tab_strip_model();
   int tab_count = tab_strip->count();
   generator.MoveMouseTo(bounds_grid_1.CenterPoint().x(),
                         bounds_grid_1.CenterPoint().y());
   generator.ClickLeftButton();
   base::MessageLoop::current()->RunUntilIdle();
   EXPECT_EQ(tab_count + 1, tab_strip->count());
@@ skipping 155 matching lines @@
       chrome::GetSettingsUrl(std::string()));
   Browser* settings_browser =
       settings_manager->FindBrowserForProfile(browser()->profile());
   ASSERT_TRUE(settings_browser);
   EXPECT_EQ(browser_count, NumberOfDetectedLauncherBrowsers(false));
   EXPECT_EQ(item_count + 1, shelf_model->item_count());
 
   // TODO(stevenjb): Test multiprofile on Chrome OS when test support is addded.
   // crbug.com/230464.
 }