summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
diff options
context:
space:
mode:
authormnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 15:58:20 +0000
committermnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-09 15:58:20 +0000
commit94f6a612700c3f7472df00b11dca7a0efa340141 (patch)
tree0ea1d30938d21af37d011e9fb7eea3e9c9dc8dc0 /chrome/browser/cocoa
parent080f7d558254ce49bd6acd70a4e1835dc6b1fc4a (diff)
downloadchromium_src-94f6a612700c3f7472df00b11dca7a0efa340141.zip
chromium_src-94f6a612700c3f7472df00b11dca7a0efa340141.tar.gz
chromium_src-94f6a612700c3f7472df00b11dca7a0efa340141.tar.bz2
Delete testing profile on UI thread.
Fixes a MAC-only test caused by the changes of r44036. BUG=none TEST=none Review URL: http://codereview.chromium.org/1512031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_test_helper.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_test_helper.h b/chrome/browser/cocoa/browser_test_helper.h
index 1b63780..0420c7a 100644
--- a/chrome/browser/cocoa/browser_test_helper.h
+++ b/chrome/browser/cocoa/browser_test_helper.h
@@ -28,6 +28,14 @@ class BrowserTestHelper {
browser_.reset(new Browser(Browser::TYPE_NORMAL, profile_.get()));
}
+ ~BrowserTestHelper() {
+ // Delete the testing profile on the UI thread. But first release the
+ // browser, since it may trigger accesses to the profile upon destruction.
+ browser_.reset(NULL);
+ message_loop_.DeleteSoon(FROM_HERE, profile_.release());
+ message_loop_.RunAllPending();
+ }
+
TestingProfile* profile() const { return profile_.get(); }
Browser* browser() const { return browser_.get(); }