Combine PDF plugin into the Chromium binary.

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index e27baa88c17857c34c158903d64a9cd9de7a7158..12d15286cd6dfb8fa20c5239de2d2c31818f9c87 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -188,6 +188,11 @@
                 '../build/linux/system.gyp:xext',
               ],
             }],
+            ['enable_plugins==1', {
+              'dependencies': [
+                '../pdf/pdf.gyp:pdf',
+              ],
+            }],
           ],
           'sources': [
             'app/chrome_dll_resource.h',
@@ -426,20 +431,6 @@
             # NOTE: chrome/app/theme/chromium/BRANDING and
             # chrome/app/theme/google_chrome/BRANDING have the short name
             # "chrome" etc.; should we try to extract from there instead?
-
-            # CrOS does this in a separate build step.
-            ['OS=="linux" and chromeos==0 and linux_dump_symbols==1', {
-              'dependencies': [
-                '../pdf/pdf.gyp:pdf_linux_symbols',
-              ],
-            }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
-            # Android doesn't use pdfium.
-            ['OS!="android"', {
-              'dependencies': [
-                # On Mac, this is done in chrome_dll.gypi.
-                '../pdf/pdf.gyp:pdf',
-              ],
-            }], # OS=="android"
           ],
           'dependencies': [
             '../components/components.gyp:startup_metric_utils',