Remove more dead app list code.

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 <stddef.h>
 
 #include <string>
 #include <vector>
@@ skipping 86 matching lines @@
 
   // Tests that pressing the search box's back button navigates correctly.
   void RunBackTest();
 
   // Tests displaying of the app list and shows the start page.
   void RunStartPageTest();
 
   // Tests switching rapidly between multiple pages of the launcher.
   void RunPageSwitchingAnimationTest();
 
-  // Tests changing the App List profile.
-  void RunProfileChangeTest();
-
   // Tests displaying of the search results.
   void RunSearchResultsTest();
 
   // Tests displaying the app list overlay.
   void RunAppListOverlayTest();
 
   // A standard set of checks on a view, e.g., ensuring it is drawn and visible.
   static void CheckView(views::View* subview);
 
   // Invoked when the Widget is closing, and the view it contains is about to
@@ skipping 334 matching lines @@
   contents_view->SetActiveState(AppListModel::STATE_APPS);
   IsStateShown(AppListModel::STATE_START);
 
   // Call Layout(). Should jump to the third page.
   contents_view->Layout();
   IsStateShown(AppListModel::STATE_APPS);
 
   Close();
 }
 
-void AppListViewTestContext::RunProfileChangeTest() {
-  EXPECT_FALSE(view_->GetWidget()->IsVisible());
-  EXPECT_EQ(-1, GetPaginationModel()->total_pages());
-  delegate_->GetTestModel()->PopulateApps(kInitialItems);
-
-  Show();
-
-  EXPECT_EQ(2, GetPaginationModel()->total_pages());
-
-  // Change the profile. The original model needs to be kept alive for
-  // observers to unregister themselves.
-  std::unique_ptr<AppListTestModel> original_test_model(
-      delegate_->ReleaseTestModel());
-  delegate_->set_next_profile_app_count(1);
-
-  // The original ContentsView is destroyed here.
-  view_->SetProfileByPath(base::FilePath());
-  EXPECT_EQ(1, GetPaginationModel()->total_pages());
-
-  StartPageView* start_page_view =
-      view_->app_list_main_view()->contents_view()->start_page_view();
-  EXPECT_NO_FATAL_FAILURE(CheckView(start_page_view));
-
-  // New model updates should be processed by the start page view.
-  delegate_->GetTestModel()->results()->Add(
-      base::MakeUnique<TestStartPageSearchResult>());
-  start_page_view->UpdateForTesting();
-  EXPECT_EQ(1u, GetVisibleViews(start_page_view->tile_views()));
-
-  // Old model updates should be ignored.
-  original_test_model->results()->Add(
-      base::MakeUnique<TestStartPageSearchResult>());
-  original_test_model->results()->Add(
-      base::MakeUnique<TestStartPageSearchResult>());
-  start_page_view->UpdateForTesting();
-  EXPECT_EQ(1u, GetVisibleViews(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);
 
   Show();
 
   AppListMainView* main_view = view_->app_list_main_view();
   ContentsView* contents_view = main_view->contents_view();
@@ skipping 74 matching lines @@
 
   // testing::Test overrides:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
 
     // On Ash (only) the app list is placed into an aura::Window "container",
     // which is also used to determine the context. In tests, use the ash root
     // window as the parent. This only works on aura where the root window is a
     // NativeView as well as a NativeWindow.
     gfx::NativeView container = NULL;
-#if defined(USE_AURA)
     container = GetContext();
-#endif
-
     test_context_.reset(new AppListViewTestContext(container));
   }
 
   void TearDown() override {
     test_context_.reset();
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   std::unique_ptr<AppListViewTestContext> test_context_;
@@ skipping 19 matching lines @@
     views::ViewsTestBase::TearDown();
   }
 
  protected:
   std::unique_ptr<AppListViewTestContext> test_context_;
 
  private:
   class AppListViewTestViewsDelegate : public views::TestViewsDelegate {
    public:
     explicit AppListViewTestViewsDelegate(AppListViewTestDesktop* parent)
-#if defined(OS_CHROMEOS)
         : parent_(parent)
-#endif
     {
     }
 
     // Overridden from views::ViewsDelegate:
     void OnBeforeWidgetInit(
         views::Widget::InitParams* params,
         views::internal::NativeWidgetDelegate* delegate) override;
 
    private:
-#if defined(OS_CHROMEOS)
     AppListViewTestDesktop* parent_;
-#endif
 
     DISALLOW_COPY_AND_ASSIGN(AppListViewTestViewsDelegate);
   };
 
   DISALLOW_COPY_AND_ASSIGN(AppListViewTestDesktop);
 };
 
 void AppListViewTestDesktop::AppListViewTestViewsDelegate::OnBeforeWidgetInit(
     views::Widget::InitParams* params,
     views::internal::NativeWidgetDelegate* delegate) {
 // Mimic the logic in ChromeViewsDelegate::OnBeforeWidgetInit(). Except, for
 // ChromeOS, use the root window from the AuraTestHelper rather than depending
 // on ash::Shell:GetPrimaryRootWindow(). Also assume non-ChromeOS is never the
 // Ash desktop, as that is covered by AppListViewTestAura.
-#if defined(OS_CHROMEOS)
   if (!params->parent && !params->context)
     params->context = parent_->GetContext();
-#elif defined(USE_AURA)
-  if (params->parent == NULL && params->context == NULL && !params->child)
-    params->native_widget = new views::DesktopNativeWidgetAura(delegate);
-#endif
 }
 
 }  // namespace
 
 // Tests showing the app list with basic test model in an ash-style root window.
 TEST_F(AppListViewTestAura, Display) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunDisplayTest());
 }
 
 // Tests showing the app list on the desktop. Note on ChromeOS, this will still
@@ skipping 23 matching lines @@
 
 // Tests that the start page view operates correctly.
 TEST_F(AppListViewTestAura, PageSwitchingAnimationTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunPageSwitchingAnimationTest());
 }
 
 TEST_F(AppListViewTestDesktop, PageSwitchingAnimationTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunPageSwitchingAnimationTest());
 }
 
-// Tests that the profile changes operate correctly.
-TEST_F(AppListViewTestAura, ProfileChangeTest) {
-  EXPECT_NO_FATAL_FAILURE(test_context_->RunProfileChangeTest());
-}
-
-TEST_F(AppListViewTestDesktop, ProfileChangeTest) {
-  EXPECT_NO_FATAL_FAILURE(test_context_->RunProfileChangeTest());
-}
-
 // Tests that the correct views are displayed for showing search results.
 TEST_F(AppListViewTestAura, SearchResultsTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunSearchResultsTest());
 }
 
 TEST_F(AppListViewTestDesktop, SearchResultsTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunSearchResultsTest());
 }
 
 // Tests that the back button navigates through the app list correctly.
 TEST_F(AppListViewTestAura, BackTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunBackTest());
 }
 
 TEST_F(AppListViewTestDesktop, BackTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunBackTest());
 }
 
 // Tests that the correct views are displayed for showing search results.
 TEST_F(AppListViewTestAura, AppListOverlayTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest());
 }
 
 TEST_F(AppListViewTestDesktop, AppListOverlayTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest());
 }
 
 }  // namespace test
 }  // namespace app_list