app_list: Fix app_list_unittests crash.

- Fix crash when enabling layers;
- Fix crash when AppsGridView is tested without host widget;

BUG=none.
TEST=app_list_unittests should pass without crash.

R=sky@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10963040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158175 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 2 deletions

diff --git a/ui/app_list/apps_grid_view.cc b/ui/app_list/apps_grid_view.cc
index 338a6cc..ef14764 100644
--- a/ui/app_list/apps_grid_view.cc
+++ b/ui/app_list/apps_grid_view.cc
@@ -293,8 +293,10 @@ void AppsGridView::SetSelectedItemByIndex(int index) {
     selected_item_index_ = index;
     AppListItemView* selected_view = GetItemViewAtIndex(selected_item_index_);
     selected_view->SchedulePaint();
-    GetWidget()->NotifyAccessibilityEvent(
-        selected_view, ui::AccessibilityTypes::EVENT_FOCUS, true);
+    if (GetWidget()) {
+      GetWidget()->NotifyAccessibilityEvent(
+          selected_view, ui::AccessibilityTypes::EVENT_FOCUS, true);
+    }
 
     if (tiles_per_page()) {
       pagination_model_->SelectPage(selected_item_index_ / tiles_per_page(),
diff --git a/ui/app_list/test/app_list_test_suite.cc b/ui/app_list/test/app_list_test_suite.cc
index cfa88f1..e38a348 100644
--- a/ui/app_list/test/app_list_test_suite.cc
+++ b/ui/app_list/test/app_list_test_suite.cc
@@ -6,6 +6,8 @@
 
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/compositor/compositor_setup.h"
+#include "ui/compositor/test/compositor_test_support.h"
 
 namespace app_list {
 namespace test {
@@ -22,9 +24,13 @@ void AppListTestSuite::Initialize() {
   // Force unittests to run using en-US so if we test against string
   // output, it'll pass regardless of the system language.
   ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
+
+  ui::CompositorTestSupport::Initialize();
+  ui::SetupTestCompositor();
 }
 
 void AppListTestSuite::Shutdown() {
+  ui::CompositorTestSupport::Terminate();
   ui::ResourceBundle::CleanupSharedInstance();
 
   base::TestSuite::Shutdown();