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

ui/app_list/views/app_list_main_view_unittest.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 "ui/app_list/views/app_list_main_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
@@ skipping 80 matching lines @@
 
   virtual void TearDown() OVERRIDE {
     widget_->Close();
     views::ViewsTestBase::TearDown();
     delegate_.reset();
   }
 
   // |point| is in |grid_view|'s coordinates.
   AppListItemView* GetItemViewAtPointInGrid(AppsGridView* grid_view,
                                             const gfx::Point& point) {
-    const views::ViewModel* view_model = grid_view->view_model_for_test();
+    const views::ViewModel<AppListItemView>* view_model =
+        grid_view->view_model_for_test();
     for (int i = 0; i < view_model->view_size(); ++i) {
       views::View* view = view_model->view_at(i);
       if (view->bounds().Contains(point)) {
         return static_cast<AppListItemView*>(view);
       }
     }
 
     return NULL;
   }
 
@@ skipping 42 matching lines @@
   }
 
   AppListFolderView* FolderView() {
     return main_view_->contents_view()
         ->apps_container_view()
         ->app_list_folder_view();
   }
 
   AppsGridView* FolderGridView() { return FolderView()->items_grid_view(); }
 
-  const views::ViewModel* RootViewModel() {
+  const views::ViewModel<AppListItemView>* RootViewModel() {
     return RootGridView()->view_model_for_test();
   }
 
-  const views::ViewModel* FolderViewModel() {
+  const views::ViewModel<AppListItemView>* FolderViewModel() {
     return FolderGridView()->view_model_for_test();
   }
 
   AppListItemView* CreateAndOpenSingleItemFolder() {
     // Prepare single folder with a single item in it.
     AppListFolderItem* folder_item =
         delegate_->GetTestModel()->CreateSingleItemFolder("single_item_folder",
                                                           "single");
     EXPECT_EQ(folder_item,
               delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
@@ skipping 87 matching lines @@
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
   base::RunLoop().RunUntilIdle();
 
   // Drop it.
   FolderGridView()->EndDrag(false);
   base::RunLoop().RunUntilIdle();
 
   // Folder icon view should be gone and there is only one item view.
   EXPECT_EQ(1, RootViewModel()->view_size());
-  EXPECT_EQ(AppListItemView::kViewClassName,
-            RootViewModel()->view_at(0)->GetClassName());
+  EXPECT_EQ(
+      AppListItemView::kViewClassName,
+      static_cast<views::View*>(RootViewModel()->view_at(0))->GetClassName());
 
   // The item view should be in slot 1 instead of slot 2 where it is dropped.
   AppsGridViewTestApi root_grid_view_test_api(RootGridView());
   root_grid_view_test_api.LayoutToIdealBounds();
   EXPECT_EQ(first_slot_tile, RootViewModel()->view_at(0)->bounds());
 
   // Single item folder should be auto removed.
   EXPECT_EQ(NULL,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
@@ skipping 16 matching lines @@
 
   // Additional mouse move operations should be ignored.
   gfx::Point point(1, 1);
   SimulateUpdateDrag(FolderGridView(), AppsGridView::MOUSE, dragged, point);
   EXPECT_FALSE(RootGridView()->has_dragged_view());
   EXPECT_FALSE(FolderGridView()->has_dragged_view());
 }
 
 }  // namespace test
 }  // namespace app_list