Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(163)

Unified Diff: ui/app_list/views/app_list_view_unittest.cc

Issue 334293005: Fix use-after-free when switching profiles in the experimental app list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add test Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/app_list/views/app_list_view_unittest.cc
diff --git a/ui/app_list/views/app_list_view_unittest.cc b/ui/app_list/views/app_list_view_unittest.cc
index d17f7d1b3d20949cae157b510ff3175b85a907df..69429e90077dbbfddcdcc5cd7699f53ddd20987c 100644
--- a/ui/app_list/views/app_list_view_unittest.cc
+++ b/ui/app_list/views/app_list_view_unittest.cc
@@ -16,6 +16,7 @@
#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"
@@ -339,10 +340,16 @@ void AppListViewTestContext::RunProfileChangeTest() {
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);
}

Powered by Google App Engine
This is Rietveld 408576698