diff options
| -rw-r--r-- | chrome/browser/cocoa/sidebar_controller.mm | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/view_id_util_browsertest.mm | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/sidebar_controller.mm b/chrome/browser/cocoa/sidebar_controller.mm index 403ec10..9b879d6 100644 --- a/chrome/browser/cocoa/sidebar_controller.mm +++ b/chrome/browser/cocoa/sidebar_controller.mm @@ -47,6 +47,11 @@ const int kMinWebWidth = 50; return self; } +- (void)dealloc { + [sidebarView_ setDelegate:nil]; + [super dealloc]; +} + - (void)updateSidebarForTabContents:(TabContents*)contents { // Get the active sidebar content. if (SidebarManager::GetInstance() == NULL) // Happens in tests. diff --git a/chrome/browser/cocoa/view_id_util_browsertest.mm b/chrome/browser/cocoa/view_id_util_browsertest.mm index 52bb3e1..e18ae03 100644 --- a/chrome/browser/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/cocoa/view_id_util_browsertest.mm @@ -91,9 +91,7 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { ASSERT_NO_FATAL_FAILURE(DoTest()); } -// Fullscreen test is crashy -// http://crbug.com/55643 -IN_PROC_BROWSER_TEST_F(ViewIDTest, DISABLED_Fullscreen) { +IN_PROC_BROWSER_TEST_F(ViewIDTest, Fullscreen) { browser()->window()->SetFullscreen(true); ASSERT_NO_FATAL_FAILURE(DoTest()); } |