Remove separate SearchResultListView from ContentsView.

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 <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #include "ui/app_list/test/test_search_result.h"
 #include "ui/app_list/views/app_list_folder_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/apps_container_view.h"
 #include "ui/app_list/views/apps_grid_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/search_box_view.h"
-#include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/search_result_page_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/app_list/views/start_page_view.h"
 #include "ui/app_list/views/test/apps_grid_view_test_api.h"
 #include "ui/app_list/views/tile_item_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
@@ skipping 554 matching lines @@
 
   // Show the search results.
   contents_view->ShowSearchResults(true);
   contents_view->Layout();
   EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_SEARCH_RESULTS));
 
   const gfx::Rect default_contents_bounds =
       contents_view->GetDefaultContentsBounds();
   EXPECT_EQ(AppListModel::STATE_SEARCH_RESULTS,
             delegate_->GetTestModel()->state());
-  if (test_type_ == EXPERIMENTAL) {
-    EXPECT_EQ(default_contents_bounds,
-              contents_view->search_results_page_view()->bounds());
-  } else {
-    EXPECT_EQ(default_contents_bounds,
-              contents_view->search_results_list_view()->bounds());
-  }
+  EXPECT_EQ(default_contents_bounds,
+            contents_view->search_results_page_view()->bounds());
 
   // Hide the search results.
   contents_view->ShowSearchResults(false);
   contents_view->Layout();
 
   // Check that we return to the page that we were on before the search.
   EXPECT_TRUE(contents_view->IsStateActive(AppListModel::STATE_APPS));
   EXPECT_EQ(AppListModel::STATE_APPS, delegate_->GetTestModel()->state());
   EXPECT_EQ(default_contents_bounds,
             contents_view->apps_container_view()->bounds());
@@ skipping 208 matching lines @@
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 #endif
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list