Make app list recommendations into their own DisplayType.

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 54 matching lines @@
   view->OnMouseReleased(ui::MouseEvent(ui::ET_MOUSE_RELEASED,
                                        center,
                                        center,
                                        ui::EF_LEFT_MOUSE_BUTTON,
                                        ui::EF_LEFT_MOUSE_BUTTON));
 }
 
 // Choose a set that is 3 regular app list pages and 2 landscape app list pages.
 const int kInitialItems = 34;
 
-class TestTileSearchResult : public TestSearchResult {
+class TestStartPageSearchResult : public TestSearchResult {
  public:
-  TestTileSearchResult() { set_display_type(DISPLAY_TILE); }
-  ~TestTileSearchResult() override {}
+  TestStartPageSearchResult() { set_display_type(DISPLAY_RECOMMENDATION); }
+  ~TestStartPageSearchResult() override {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestTileSearchResult);
+  DISALLOW_COPY_AND_ASSIGN(TestStartPageSearchResult);
 };
 
 // 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
@@ skipping 364 matching lines @@
     EXPECT_TRUE(start_page_view->all_apps_button()->visible());
     SimulateClick(start_page_view->all_apps_button());
     main_view->contents_view()->Layout();
     EXPECT_TRUE(IsStateShown(AppListModel::STATE_APPS));
 
     // 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->results()->Add(new TestTileSearchResult());
+    model->results()->Add(new TestStartPageSearchResult());
     start_page_view->UpdateForTesting();
     EXPECT_EQ(1u, GetVisibleViews(start_page_view->tile_views()));
     model->results()->DeleteAll();
     start_page_view->UpdateForTesting();
     EXPECT_EQ(0u, GetVisibleViews(start_page_view->tile_views()));
   } else {
     EXPECT_EQ(NULL, start_page_view);
   }
 
   Close();
@@ skipping 68 matching lines @@
   EXPECT_EQ(1, GetPaginationModel()->total_pages());
 
   StartPageView* start_page_view =
       view_->app_list_main_view()->contents_view()->start_page_view();
   if (test_type_ == EXPERIMENTAL)
     EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
   else
     EXPECT_EQ(NULL, start_page_view);
 
   // New model updates should be processed by the start page view.
-  delegate_->GetTestModel()->results()->Add(new TestTileSearchResult());
+  delegate_->GetTestModel()->results()->Add(new TestStartPageSearchResult());
   if (test_type_ == EXPERIMENTAL) {
     start_page_view->UpdateForTesting();
     EXPECT_EQ(1u, GetVisibleViews(start_page_view->tile_views()));
   }
 
   // Old model updates should be ignored.
-  original_test_model->results()->Add(new TestTileSearchResult());
-  original_test_model->results()->Add(new TestTileSearchResult());
+  original_test_model->results()->Add(new TestStartPageSearchResult());
+  original_test_model->results()->Add(new TestStartPageSearchResult());
   if (test_type_ == EXPERIMENTAL) {
     start_page_view->UpdateForTesting();
     EXPECT_EQ(1u, GetVisibleViews(start_page_view->tile_views()));
   }
 
   Close();
 }
 
 void AppListViewTestContext::RunSearchResultsTest() {
   EXPECT_FALSE(view_->GetWidget()->IsVisible());
@@ skipping 242 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