1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app_list/cocoa/apps_grid_controller_unittest.mm b/ui/app_list/cocoa/apps_grid_controller_unittest.mm
index b1878ac..08dd4aa 100644
--- a/ui/app_list/cocoa/apps_grid_controller_unittest.mm
+++ b/ui/app_list/cocoa/apps_grid_controller_unittest.mm
@@ -109,6 +109,7 @@ class AppsGridControllerTest : public AppsGridControllerTestHelper {
   }
 
   virtual void TearDown() OVERRIDE {
+    [owned_apps_grid_controller_ setDelegate:NULL];
     owned_apps_grid_controller_.reset();
     AppsGridControllerTestHelper::TearDown();
   }
@@ -304,8 +305,7 @@ TEST_F(AppsGridControllerTest, SelectionChangesTextColor) {
 }
 
 // Tests basic keyboard navigation on the first page.
-// TODO(stevenjb): Flaky. crbug.com/321284
-TEST_F(AppsGridControllerTest, DISABLED_FirstPageKeyboardNavigation) {
+TEST_F(AppsGridControllerTest, FirstPageKeyboardNavigation) {
   model()->PopulateApps(kItemsPerPage - 2);
   EXPECT_EQ(kItemsPerPage - 2, [[GetPageAt(0) content] count]);