win: Enable PDF for metafile as default

Main code landed at r271772. This can be on by default now
that internal_pdf is gone. If this seems stable after some releases
I'll remove the gyp flag and related code.

R=vitalybuka@chromium.org
BUG=170859

Review URL: https://codereview.chromium.org/293983010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272250 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -420,7 +420,7 @@
       'enable_printing%': 1,
 
       # Windows prints using a PDF as the metafile from the renderer.
-      'win_pdf_metafile_for_printing%': 0,
+      'win_pdf_metafile_for_printing%': 1,
 
       # Set the version of CLD.
       #   0: Don't specify the version. This option is for the Finch testing.
@@ -2627,7 +2627,7 @@
       ['enable_printing==2', {
         'defines': ['ENABLE_PRINTING=1'],
       }],
-      ['win_pdf_metafile_for_printing==1', {
+      ['OS=="win" and win_pdf_metafile_for_printing==1', {
         'defines': ['WIN_PDF_METAFILE_FOR_PRINTING=1'],
       }],
       ['enable_spellcheck==1', {

chrome/renderer/printing/print_web_view_helper_browsertest.cc

@@ -317,7 +317,7 @@ TEST_F(PrintWebViewHelperTest, BlockScriptInitiatedPrintingFromPopup) {
   VerifyPagesPrinted(true);
 }
 
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if (defined(OS_WIN) && !WIN_PDF_METAFILE_FOR_PRINTING) || defined(OS_MACOSX)
 // TODO(estade): I don't think this test is worth porting to Linux. We will have
 // to rip out and replace most of the IPC code if we ever plan to improve
 // printing, and the comment below by sverrir suggests that it doesn't do much
@@ -403,7 +403,8 @@ const TestPageData kTestPages[] = {
 // TODO(estade): need to port MockPrinter to get this on Linux. This involves
 // hooking up Cairo to read a pdf stream, or accessing the cairo surface in the
 // metafile directly.
-#if defined(OS_WIN) || defined(OS_MACOSX)
+// Same for printing via PDF on Windows.
+#if (defined(OS_WIN) && !WIN_PDF_METAFILE_FOR_PRINTING) || defined(OS_MACOSX)
 TEST_F(PrintWebViewHelperTest, PrintLayoutTest) {
   bool baseline = false;