Rename AppListMainViewTest::ContentsView to AppListMainViewTest::GetContentsView to fix build break

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 136 matching lines @@
                           AppsGridView::Pointer pointer,
                           AppListItemView* drag_view,
                           const gfx::Point& point) {
     DCHECK(drag_view);
     gfx::Point translated =
         gfx::PointAtOffsetFromOrigin(point - drag_view->bounds().origin());
     ui::MouseEvent drag_event(ui::ET_MOUSE_DRAGGED, translated, point, 0, 0);
     grid_view->UpdateDragFromItem(pointer, drag_event);
   }
 
-  ContentsView* ContentsView() { return main_view_->contents_view(); }
+  ContentsView* contents_view() { return main_view_->contents_view(); }
 
   AppsGridView* RootGridView() {
-    return ContentsView()->apps_container_view()->apps_grid_view();
+    return contents_view()->apps_container_view()->apps_grid_view();
   }
 
   AppListFolderView* FolderView() {
-    return ContentsView()->apps_container_view()->app_list_folder_view();
+    return contents_view()->apps_container_view()->app_list_folder_view();
   }
 
   AppsGridView* FolderGridView() { return FolderView()->items_grid_view(); }
 
   const views::ViewModelT<AppListItemView>* RootViewModel() {
     return RootGridView()->view_model_for_test();
   }
 
   const views::ViewModelT<AppListItemView>* FolderViewModel() {
     return FolderGridView()->view_model_for_test();
@@ skipping 116 matching lines @@
 }
 
 // Tests dragging an item out of a single item folder and dropping it onto the
 // page switcher. Regression test for http://crbug.com/415530/.
 TEST_F(AppListMainViewTest, DragReparentItemOntoPageSwitcher) {
   // Number of apps to populate. Should provide more than 1 page of apps (6*4 =
   // 24).
   const int kNumApps = 30;
 
   // Ensure we are on the apps grid view page.
-  app_list::ContentsView* contents_view = ContentsView();
-  contents_view->SetActivePage(
-      contents_view->GetPageIndexForState(AppListModel::STATE_APPS));
-  contents_view->Layout();
+  app_list::ContentsView* contents_view_ptr = contents_view();

[Matt Giuca, 2014/12/02 06:13:18]

I don't like the name "contents_view_ptr". It's unfortunate you had to rename
this as well.

Suggest renaming the method to GetContentsView and then this variable can remain
as contents_view.

+  contents_view_ptr->SetActivePage(
+      contents_view_ptr->GetPageIndexForState(AppListModel::STATE_APPS));
+  contents_view_ptr->Layout();
 
   AppListItemView* folder_item_view = CreateAndOpenSingleItemFolder();
   const gfx::Rect first_slot_tile = folder_item_view->bounds();
 
   delegate_->GetTestModel()->PopulateApps(kNumApps);
 
   EXPECT_EQ(1, FolderViewModel()->view_size());
   EXPECT_EQ(kNumApps + 1, RootViewModel()->view_size());
 
   AppListItemView* dragged = StartDragForReparent(0);
@@ skipping 62 matching lines @@
   // The app list model should remain unchanged.
   EXPECT_EQ(1, FolderViewModel()->view_size());
   EXPECT_EQ(2, RootViewModel()->view_size());
   EXPECT_EQ(folder_id, RootGridView()->GetItemViewAt(0)->item()->id());
   EXPECT_NE(nullptr,
             delegate_->GetTestModel()->FindFolderItem("single_item_folder"));
 }
 
 }  // namespace test
 }  // namespace app_list