Fix use-after-free when switching profiles 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 "testing/gtest/include/gtest/gtest.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/pagination_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/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_switcher_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/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/aura/test/aura_test_base.h"
 #include "ui/aura/window.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/views_delegate.h"
@@ skipping 303 matching lines @@
   scoped_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();
+  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()));
 
   // Old model updates should be ignored.
   original_test_model->CreateAndAddItem("Test App 2");
@@ skipping 187 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