[Mac] Inform reference counted objects that hold a weak Browser* when the Browser is being destroye…

chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
-#import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // An NSView that fakes out hitTest:.
 @interface HitView : NSView {
   id hitTestReturn_;
 }
@@ skipping 47 matching lines @@
   void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     CommandUpdater* updater =
         browser()->command_controller()->command_updater();
     // The default state for the commands is true, set a couple to false to
     // ensure they get picked up correct on initialization
     updater->UpdateCommandEnabled(IDC_BACK, false);
     updater->UpdateCommandEnabled(IDC_FORWARD, false);
-    resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     bar_.reset([[TestToolbarController alloc]
         initWithCommands:browser()->command_controller()->command_updater()
                  profile:profile()
-                 browser:browser()
-          resizeDelegate:resizeDelegate_.get()]);
+                 browser:browser()]);
     EXPECT_TRUE([bar_ view]);
     NSView* parent = [test_window() contentView];
     [parent addSubview:[bar_ view]];
   }
 
   void TearDown() override {
     bar_.reset();  // browser() must outlive the ToolbarController.
     CocoaProfileTest::TearDown();
   }
 
   // Make sure the enabled state of the view is the same as the corresponding
   // command in the updater. The views are in the declaration order of outlets.
   void CompareState(CommandUpdater* updater, NSArray* views) {
     EXPECT_EQ(updater->IsCommandEnabled(IDC_BACK),
               [[views objectAtIndex:kBackIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_FORWARD),
               [[views objectAtIndex:kForwardIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_RELOAD),
               [[views objectAtIndex:kReloadIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_HOME),
               [[views objectAtIndex:kHomeIndex] isEnabled] ? true : false);
   }
 
-  base::scoped_nsobject<ViewResizerPong> resizeDelegate_;
   base::scoped_nsobject<TestToolbarController> bar_;
 };
 
 TEST_VIEW(ToolbarControllerTest, [bar_ view])
 
 // Test the initial state that everything is sync'd up
 TEST_F(ToolbarControllerTest, InitialState) {
   CommandUpdater* updater = browser()->command_controller()->command_updater();
   CompareState(updater, [bar_ toolbarViews]);
 }
@@ skipping 163 matching lines @@
  private:
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserRemovedObserver);
 };
 
 // Test that ToolbarController can be destroyed after the Browser.
 // This can happen because the ToolbarController is retained by both the
 // BrowserWindowController and -[ToolbarController view], the latter of which is
 // autoreleased.
-// TODO(nhiroki): This is disabled due to http://crbug.com/506745.
-TEST_F(ToolbarControllerTest, DISABLED_ToolbarDestroyedAfterBrowser) {
+TEST_F(ToolbarControllerTest, ToolbarDestroyedAfterBrowser) {
   BrowserRemovedObserver observer;
+  // This is normally called by BrowserWindowController, but since |bar_| is not
+  // owned by one, call it here.
+  [bar_ browserWillBeDestroyed];
   CloseBrowserWindow();
   observer.WaitUntilBrowserRemoved();
   // |bar_| is released in TearDown().
 }
 
 }  // namespace