diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 18:05:07 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 18:05:07 +0000 |
| commit | fdb76bc30324784d2ae7a195f3b32303825bfb8b (patch) | |
| tree | e9cbb00a4a2e4d0f837277be687eb6b11160e047 /ui/app_list | |
| parent | 141bdfe2255d19426410825872074418484cdefd (diff) | |
| download | chromium_src-fdb76bc30324784d2ae7a195f3b32303825bfb8b.zip chromium_src-fdb76bc30324784d2ae7a195f3b32303825bfb8b.tar.gz chromium_src-fdb76bc30324784d2ae7a195f3b32303825bfb8b.tar.bz2 | |
Reset item models in appsGridController dealloc
Also re-enables AppsGridControllerTest.FirstPageKeyboardNavigation
BUG=321284
Review URL: https://codereview.chromium.org/77453008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list')
| -rw-r--r-- | ui/app_list/cocoa/apps_grid_controller_unittest.mm | 4 |
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]); |