Revert "Fix the Crash in the launcher's start page on Chrome OS."

This reverts commit 49ff2930.

This CL (https://codereview.chromium.org/2605463003/) has been merged
to M56, so revert it on Tot. A better fix will be landed later.

BUG=675150
TBR=xiyuan@chromium.org

Review-Url: https://codereview.chromium.org/2613993002
Cr-Commit-Position: refs/heads/master@{#441715}

ui/app_list/views/search_result_container_view.h

@@ -48,7 +48,6 @@ class APP_LIST_EXPORT SearchResultContainerView : public views::View,
   bool IsValidSelectionIndex(int index) const;
 
   int num_results() const { return num_results_; }
-  void set_num_results(int num_results) { num_results_ = num_results; }
 
   void set_container_score(double score) { container_score_ = score; }
   double container_score() const { return container_score_; }

ui/app_list/views/start_page_view.cc

@@ -190,7 +190,7 @@ int StartPageView::StartPageTilesContainer::Update() {
       delete search_result_tile_views_[i];
     search_result_tile_views_.clear();
     RemoveChildView(all_apps_button_);
-    CreateAppsGrid(display_results.size());
+    CreateAppsGrid(std::min(kNumStartPageTiles, display_results.size()));
   }
 
   // Update the tile item results.
@@ -211,10 +211,10 @@ int StartPageView::StartPageTilesContainer::Update() {
 void StartPageView::StartPageTilesContainer::UpdateSelectedIndex(
     int old_selected,
     int new_selected) {
-  if (old_selected >= 0 && old_selected < num_results())
+  if (old_selected >= 0)
     GetTileItemView(old_selected)->SetSelected(false);
 
-  if (new_selected >= 0 && new_selected < num_results())
+  if (new_selected >= 0)
     GetTileItemView(new_selected)->SetSelected(true);
 }
 
@@ -360,8 +360,8 @@ void StartPageView::OnShown() {
     custom_page_view->SetVisible(
         app_list_main_view_->ShouldShowCustomLauncherPage());
   }
+  tiles_container_->Update();
   tiles_container_->ClearSelectedIndex();
-  tiles_container_->set_num_results(tiles_container_->Update());
   custom_launcher_page_background_->SetSelected(false);
 }