Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3398)

Unified Diff: chrome/renderer/print_web_view_helper_browsertest.cc

Issue 9705084: Block printing from blocked popup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More test fixes Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/print_web_view_helper_browsertest.cc
diff --git a/chrome/renderer/print_web_view_helper_browsertest.cc b/chrome/renderer/print_web_view_helper_browsertest.cc
index bc4f8a35bc2c039d1f2c2ab99fa4828d242eb0f1..75cb865848d43b1ea6789be21d136270d1268e0b 100644
--- a/chrome/renderer/print_web_view_helper_browsertest.cc
+++ b/chrome/renderer/print_web_view_helper_browsertest.cc
@@ -188,8 +188,17 @@ TEST_F(PrintWebViewHelperTest, BlockScriptInitiatedPrinting) {
LoadHTML(kPrintWithJSHTML);
VerifyPagesPrinted(false);
- // Unblock script initiated printing and verify printing works.
+ // Unblock based on count.
PrintWebViewHelper::Get(view_)->ResetScriptedPrintCount();
Lei Zhang 2012/03/19 20:19:32 You are missing a test here to make sure resetting
Albert Bodenhamer 2012/03/19 23:16:17 Good catch. I've split this into 2 different test
+
+ // Simulate a blocked popup.
+ chrome_render_thread_->printer()->ResetPrinter();
+ chrome_render_thread_->printer()->SetScriptedPrintAllowed(false);
+ LoadHTML(kPrintWithJSHTML);
+ VerifyPagesPrinted(false);
+
+ // Unblock and verify printing works.
+ chrome_render_thread_->printer()->SetScriptedPrintAllowed(true);
chrome_render_thread_->printer()->ResetPrinter();
LoadHTML(kPrintWithJSHTML);
VerifyPageCount(1);
« chrome/renderer/print_web_view_helper.cc ('K') | « chrome/renderer/print_web_view_helper.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698