Fix use-after-free when switching profiles in the experimental app list.

ui/app_list/views/app_list_main_view.h

Index: ui/app_list/views/app_list_main_view.h
diff --git a/ui/app_list/views/app_list_main_view.h b/ui/app_list/views/app_list_main_view.h
index 9737d7f2fc5bf9eb59b714bfb324dc153f71222e..63d1d80c3455837176b2d74cc06d9b8ecfb4c72c 100644
--- a/ui/app_list/views/app_list_main_view.h
+++ b/ui/app_list/views/app_list_main_view.h
@@ -26,6 +26,7 @@ class AppListItem;
 class AppListModel;
 class AppListViewDelegate;
 class ApplicationDragAndDropHost;
+class ContentsSwitcherView;
 class ContentsView;
 class PaginationModel;
 class SearchBoxView;
@@ -65,6 +66,9 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
       ApplicationDragAndDropHost* drag_and_drop_host);
 
   ContentsView* contents_view() const { return contents_view_; }
+  ContentsSwitcherView* contents_switcher_view() const {
+    return contents_switcher_view_;
+  }
   AppListModel* model() { return model_; }
 
   // Returns true if the app list should be centered and in landscape mode.
@@ -73,7 +77,8 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
  private:
   class IconLoader;
 
-  void AddContentsView();
+  // Adds the ContentsView and the ContentsSwitcherView.
+  void AddContentsViews();
 
   // Gets the PaginationModel owned by the AppsGridView.
   PaginationModel* GetAppsPaginationModel();
@@ -110,6 +115,9 @@ class APP_LIST_EXPORT AppListMainView : public views::View,
   SearchBoxView* search_box_view_;  // Owned by views hierarchy.
   ContentsView* contents_view_;  // Owned by views hierarchy.
 
+  // Owned by views hierarchy. NULL in the non-experimental app list.
+  ContentsSwitcherView* contents_switcher_view_;
+
   // A timer that fires when maximum allowed time to wait for icon loading has
   // passed.
   base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;