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(); }
+  app_list::ContentsView* ContentsView() { return main_view_->contents_view(); }

[Matt Giuca, 2014/12/02 04:33:37]

I'm not too sure about this, but I asked around and was told that the root cause
of this issue is not the namespacing, but the fact that ContentsView is the name
of both the method and the class.

We should *not* have to explicitly qualify this type. The correct fix (I think)
is to just rename the method. The correct name for this method is
contents_view() or GetContentsView(). I prefer contents_view() since the
accessor is reasonably simple. Would you be able to rename it and try again?

(Don't worry about renaming these other methods; there would be too many places
to update.)

 
   AppsGridView* RootGridView() {
     return ContentsView()->apps_container_view()->apps_grid_view();
   }
 
   AppListFolderView* FolderView() {
     return ContentsView()->apps_container_view()->app_list_folder_view();
   }
 
   AppsGridView* FolderGridView() { return FolderView()->items_grid_view(); }
@@ skipping 209 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