Allow app list tiles to show search results in the experimental app list.

ui/app_list/views/app_list_view_unittest.cc

 // Copyright 2014 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_view.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 43 matching lines @@
        ++it) {
     if ((*it)->visible())
       count++;
   }
   return count;
 }
 
 // Choose a set that is 3 regular app list pages and 2 landscape app list pages.
 const int kInitialItems = 34;
 
+class TestTileSearchResult : public SearchResult {
+ public:
+  TestTileSearchResult() { set_display_type(DISPLAY_TILE); }
+  virtual ~TestTileSearchResult() {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TestTileSearchResult);
+};
+
 // Allows the same tests to run with different contexts: either an Ash-style
 // root window or a desktop window tree host.
 class AppListViewTestContext {
  public:
   AppListViewTestContext(int test_type, gfx::NativeView parent);
   ~AppListViewTestContext();
 
   // Test displaying the app list and performs a standard set of checks on its
   // top level views. Then closes the window.
   void RunDisplayTest();
@@ skipping 232 matching lines @@
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view));
   EXPECT_NO_FATAL_FAILURE(CheckView(main_view->contents_view()));
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
 
     // Show the start page view.
     ContentsView* contents_view = main_view->contents_view();
     ShowContentsViewPageAndVerify(contents_view->GetPageIndexForNamedPage(
         ContentsView::NAMED_PAGE_START));
     EXPECT_FALSE(main_view->search_box_view()->visible());
-    EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views()));
 
     gfx::Size view_size(view_->GetPreferredSize());
     ShowContentsViewPageAndVerify(
         contents_view->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
     EXPECT_TRUE(main_view->search_box_view()->visible());
 
     // Hiding and showing the search box should not affect the app list's
     // preferred size. This is a regression test for http://crbug.com/386912.
     EXPECT_EQ(view_size.ToString(), view_->GetPreferredSize().ToString());
 
     // Check tiles hide and show on deletion and addition.
-    model->CreateAndAddItem("Test app");
-    EXPECT_EQ(4u, GetVisibleTileItemViews(start_page_view->tile_views()));
-    model->DeleteItem(model->GetItemName(0));
-    EXPECT_EQ(3u, GetVisibleTileItemViews(start_page_view->tile_views()));
+    model->results()->Add(new TestTileSearchResult());
+    start_page_view->UpdateForTesting();
+    EXPECT_EQ(1u, GetVisibleTileItemViews(start_page_view->tile_views()));
+    model->results()->RemoveAll();
+    start_page_view->UpdateForTesting();
+    EXPECT_EQ(0u, GetVisibleTileItemViews(start_page_view->tile_views()));
   } else {
     EXPECT_EQ(NULL, start_page_view);
   }
 
   Close();
 }
 
 void AppListViewTestContext::RunPageSwitchingAnimationTest() {
   if (test_type_ == EXPERIMENTAL) {
     Show();
@@ skipping 61 matching lines @@
 
   StartPageView* start_page_view =
       view_->app_list_main_view()->contents_view()->start_page_view();
   ContentsSwitcherView* contents_switcher_view =
       view_->app_list_main_view()->contents_switcher_view();
   if (test_type_ == EXPERIMENTAL) {
     EXPECT_NO_FATAL_FAILURE(CheckView(contents_switcher_view));
     EXPECT_EQ(view_->app_list_main_view()->contents_view(),
               contents_switcher_view->contents_view());
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
-    EXPECT_EQ(1u, GetVisibleTileItemViews(start_page_view->tile_views()));
   } else {
     EXPECT_EQ(NULL, contents_switcher_view);
     EXPECT_EQ(NULL, start_page_view);
   }
 
   // New model updates should be processed by the start page view.
-  delegate_->GetTestModel()->CreateAndAddItem("Test App");
-  if (test_type_ == EXPERIMENTAL)
-    EXPECT_EQ(2u, GetVisibleTileItemViews(start_page_view->tile_views()));
+  delegate_->GetTestModel()->results()->Add(new TestTileSearchResult());
+  if (test_type_ == EXPERIMENTAL) {
+    start_page_view->UpdateForTesting();
+    EXPECT_EQ(1u, GetVisibleTileItemViews(start_page_view->tile_views()));
+  }
 
   // Old model updates should be ignored.
-  original_test_model->CreateAndAddItem("Test App 2");
-  if (test_type_ == EXPERIMENTAL)
-    EXPECT_EQ(2u, GetVisibleTileItemViews(start_page_view->tile_views()));
+  original_test_model->results()->Add(new TestTileSearchResult());
+  original_test_model->results()->Add(new TestTileSearchResult());
+  if (test_type_ == EXPERIMENTAL) {
+    start_page_view->UpdateForTesting();
+    EXPECT_EQ(1u, GetVisibleTileItemViews(start_page_view->tile_views()));
+  }
 
   Close();
 }
 
 void AppListViewTestContext::RunSearchResultsTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
   EXPECT_EQ(-1, GetPaginationModel()->total_pages());
   AppListTestModel* model = delegate_->GetTestModel();
   model->PopulateApps(3);
 
@@ skipping 234 matching lines @@
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list