summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 19:43:01 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-13 19:43:01 +0000
commit0c11dc700d78d4547f5696a22744154b97671c0e (patch)
treeb7a4780c5f418f83d6fd26b53598c848714a1826 /printing
parent79ba16881712dc74d764cc8dbbe4e59c73cad754 (diff)
downloadchromium_src-0c11dc700d78d4547f5696a22744154b97671c0e.zip
chromium_src-0c11dc700d78d4547f5696a22744154b97671c0e.tar.gz
chromium_src-0c11dc700d78d4547f5696a22744154b97671c0e.tar.bz2
Fix printing unittests after revert of r230235
r251066 reverted the backgrounding of the print dialog. Before the revert http://src.chromium.org/viewvc/chrome/trunk/src/printing/printing_context_win_unittest.cc?r1=232466&r2=232611 assumed they were going to be async, so added RunLoop. Now that the dialog is synchronous again, remove that code which is causing the MessageLoop to complain. TBR=vitalybuka@chromium.org R=asvitkine@chromium.org BUG=180997,342697 Review URL: https://codereview.chromium.org/164483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/printing_context_win_unittest.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 94f8e83..9ba6662 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h"
-#include "base/run_loop.h"
#include "printing/backend/printing_info_win.h"
#include "printing/printing_test.h"
#include "printing/printing_context.h"
@@ -23,7 +22,6 @@ class PrintingContextTest : public PrintingTest<testing::Test> {
public:
void PrintSettingsCallback(printing::PrintingContext::Result result) {
result_ = result;
- base::MessageLoop::current()->QuitWhenIdle();
}
protected:
@@ -161,7 +159,6 @@ TEST_F(PrintingContextTest, Base) {
}
TEST_F(PrintingContextTest, PrintAll) {
- base::MessageLoopForUI loop;
if (IsTestCaseDisabled())
return;
@@ -171,9 +168,7 @@ TEST_F(PrintingContextTest, PrintAll) {
context.AskUserForSettings(
NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback,
base::Unretained(this)));
- base::RunLoop().Run();
EXPECT_EQ(printing::PrintingContext::OK, result());
-
printing::PrintSettings settings = context.settings();
EXPECT_EQ(settings.ranges().size(), 0);
}