Commit 0c11dc70 authored by scottmg@chromium.org's avatar scottmg@chromium.org

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
parent 79ba1688
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/bind_helpers.h" #include "base/bind_helpers.h"
#include "base/memory/scoped_ptr.h" #include "base/memory/scoped_ptr.h"
#include "base/run_loop.h"
#include "printing/backend/printing_info_win.h" #include "printing/backend/printing_info_win.h"
#include "printing/printing_test.h" #include "printing/printing_test.h"
#include "printing/printing_context.h" #include "printing/printing_context.h"
...@@ -23,7 +22,6 @@ class PrintingContextTest : public PrintingTest<testing::Test> { ...@@ -23,7 +22,6 @@ class PrintingContextTest : public PrintingTest<testing::Test> {
public: public:
void PrintSettingsCallback(printing::PrintingContext::Result result) { void PrintSettingsCallback(printing::PrintingContext::Result result) {
result_ = result; result_ = result;
base::MessageLoop::current()->QuitWhenIdle();
} }
protected: protected:
...@@ -161,7 +159,6 @@ TEST_F(PrintingContextTest, Base) { ...@@ -161,7 +159,6 @@ TEST_F(PrintingContextTest, Base) {
} }
TEST_F(PrintingContextTest, PrintAll) { TEST_F(PrintingContextTest, PrintAll) {
base::MessageLoopForUI loop;
if (IsTestCaseDisabled()) if (IsTestCaseDisabled())
return; return;
...@@ -171,9 +168,7 @@ TEST_F(PrintingContextTest, PrintAll) { ...@@ -171,9 +168,7 @@ TEST_F(PrintingContextTest, PrintAll) {
context.AskUserForSettings( context.AskUserForSettings(
NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback, NULL, 123, false, base::Bind(&PrintingContextTest::PrintSettingsCallback,
base::Unretained(this))); base::Unretained(this)));
base::RunLoop().Run();
EXPECT_EQ(printing::PrintingContext::OK, result()); EXPECT_EQ(printing::PrintingContext::OK, result());
printing::PrintSettings settings = context.settings(); printing::PrintSettings settings = context.settings();
EXPECT_EQ(settings.ranges().size(), 0); EXPECT_EQ(settings.ranges().size(), 0);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment