Merge 218339 "Submitting https://codereview.chromium.org/2311600..."

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 218991)
+++ build/common.gypi	(working copy)
@@ -523,7 +523,6 @@
           'enable_automation%': 0,
           'enable_extensions%': 0,
           'enable_google_now%': 0,
-          'enable_printing%': 0,
           'enable_spellcheck%': 0,
           'enable_themes%': 0,
           'proprietary_codecs%': 1,
@@ -534,6 +533,15 @@
           'native_memory_pressure_signals%': 1,
         }],
 
+	# Enable basic printing for Chrome for Android but disable printing
+	# completely for WebView.
+        ['OS=="android" and android_webview_build==0', {
+          'enable_printing%': 2,
+        }],
+        ['OS=="android" and android_webview_build==1', {
+          'enable_printing%': 0,
+        }],
+
         # Enable autofill dialog for Android, Mac and Views-enabled platforms.
         ['toolkit_views==1 or (OS=="android" and android_webview_build==0) or OS=="mac"', {
           'enable_autofill_dialog%': 1