diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 07:11:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-21 07:11:09 +0000 |
| commit | a1d95192791e23f196ed6f14d17e3adec1034754 (patch) | |
| tree | 737ba7f03792b233fe28c2257a66acb63fa5d016 | |
| parent | dbe82c4c228ca2f2b86d1e5fe7c1080bfd2d4916 (diff) | |
| download | chromium_src-a1d95192791e23f196ed6f14d17e3adec1034754.zip chromium_src-a1d95192791e23f196ed6f14d17e3adec1034754.tar.gz chromium_src-a1d95192791e23f196ed6f14d17e3adec1034754.tar.bz2 | |
Fix for LinkInfoBarControllerTest tests. The stack traces aren't symbolized so it's hard to see, but the profile was being deleted while there was a pending task that used the ResourceContext (for appcache initialization).
BUG=115058
TBR=avi
Review URL: https://chromiumcodereview.appspot.com/9423050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122801 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/cocoa/cocoa_profile_test.mm | 1 | ||||
| -rw-r--r-- | chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index 380805b..f4476fa 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -27,6 +27,7 @@ CocoaProfileTest::~CocoaProfileTest() { // browser, since it may trigger accesses to the profile upon destruction. browser_.reset(); + message_loop_.RunAllPending(); // Some services created on the TestingProfile require deletion on the UI // thread. If the scoper in TestingBrowserProcess, owned by ChromeTestSuite, // were to delete the ProfileManager, the UI thread would at that point no diff --git a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm index 47b3f7e..6b66e00 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.mm @@ -192,8 +192,6 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest, //////////////////////////////////////////////////////////////////////////// // Tests -// TODO(jam): http://crbug.com/115058 -/* TEST_VIEW(LinkInfoBarControllerTest, [controller_ view]); TEST_F(LinkInfoBarControllerTest, ShowAndDismiss) { @@ -236,7 +234,6 @@ TEST_F(LinkInfoBarControllerTest, DeallocController) { controller_.reset(nil); ASSERT_FALSE(delegate_closed()); } -*/ TEST_VIEW(ConfirmInfoBarControllerTest, [controller_ view]); |