diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 18:38:00 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-12 18:38:00 +0000 |
commit | e43bb3f5af7336cb445e8f4b87b0f165490f5142 (patch) | |
tree | 0853d3892d7c4735f285882ba216533d2d325b9d /chrome/browser/printing/printing_layout_uitest.cc | |
parent | eff4aecbb593d1d145fdd34af136ff939a2bca43 (diff) | |
download | chromium_src-e43bb3f5af7336cb445e8f4b87b0f165490f5142.zip chromium_src-e43bb3f5af7336cb445e8f4b87b0f165490f5142.tar.gz chromium_src-e43bb3f5af7336cb445e8f4b87b0f165490f5142.tar.bz2 |
Use the new Thread::StopSoon() facility. Add a new tight loop to control the worker thread shutdown in a way that is safe even for printer driver that displays a dialog box and attaches to the browser window.
BUG=1274015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@729 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/printing_layout_uitest.cc')
-rw-r--r-- | chrome/browser/printing/printing_layout_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc index 9a6d04c..ffd20d7 100644 --- a/chrome/browser/printing/printing_layout_uitest.cc +++ b/chrome/browser/printing/printing_layout_uitest.cc @@ -565,7 +565,7 @@ TEST_F(PrintingLayoutTestHidden, ManyTimes) { } // Prints a popup and immediately closes it. -TEST_F(PrintingLayoutTest, DISABLED_Delayed) { +TEST_F(PrintingLayoutTest, Delayed) { if (IsTestCaseDisabled()) return; @@ -605,7 +605,7 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) { } // Prints a popup and immediately closes it. -TEST_F(PrintingLayoutTest, DISABLED_IFrame) { +TEST_F(PrintingLayoutTest, IFrame) { if (IsTestCaseDisabled()) return; |