Combine PDF plugin into the Chromium binary.

chrome/renderer/chrome_render_process_observer.cc

Index: chrome/renderer/chrome_render_process_observer.cc
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index 9367b98d2318f32f4367e403054aefe549379c54..a42da85d6f7db3b74a815eb03fd7cb7e26afd832 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -27,6 +27,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/variations/variations_util.h"
+#include "chrome/installer/util/util_constants.h"
 #include "chrome/renderer/content_settings_observer.h"
 #include "chrome/renderer/security_filter_peer.h"
 #include "content/public/child/resource_dispatcher_delegate.h"
@@ -285,14 +286,17 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver(
   // PDF is always OOP and/or PDF is made to use Skia instead of GDI directly.
   if (!command_line.HasSwitch(switches::kEnableOutOfProcessPdf)) {
     // Need to patch a few functions for font loading to work correctly.
-    base::FilePath pdf;
-    if (PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf) &&
-        base::PathExists(pdf)) {
-      g_iat_patch_createdca.Patch(pdf.value().c_str(), "gdi32.dll", "CreateDCA",
-                                  CreateDCAPatch);
-      g_iat_patch_get_font_data.Patch(pdf.value().c_str(), "gdi32.dll",
-                                      "GetFontData", GetFontDataPatch);
-    }
+    const wchar_t* chrome_dll_name =
+#if defined(CHROME_MULTIPLE_DLL_CHILD)
+      installer::kChromeChildDll;
+#else
+      installer::kChromeDll;
+#endif
+
+    g_iat_patch_createdca.Patch(chrome_dll_name, "gdi32.dll", "CreateDCA",
+                                CreateDCAPatch);
+    g_iat_patch_get_font_data.Patch(chrome_dll_name, "gdi32.dll",
+                                    "GetFontData", GetFontDataPatch);
   }
 #endif