diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index e19f5501df03213dc6a408a1fadd7f815046f8d4..2801b5b14d42cd020af46bad7fd08e7c9e74a629 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -875,6 +875,7 @@ int ChromeMain(int argc, char** argv) {
   if (process_type == switches::kRendererProcess ||
       process_type == switches::kExtensionProcess ||
       process_type == switches::kNaClLoaderProcess ||
+      process_type == switches::kPpapiPluginProcess ||
       process_type == switches::kGpuProcess) {
     initialize_sandbox = false;
   }
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
index 181cf0aef6926f8c6544d63543b43eb1d2e8e240..1b8e612fafaf257d1989a8c3414ef7184705d4a0 100644
--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -237,6 +237,18 @@ bool PathProvider(int key, FilePath* result) {
       cur = cur.Append(FILE_PATH_LITERAL("PDF.plugin"));
 #else  // Linux and Chrome OS
       cur = cur.Append(FILE_PATH_LITERAL("libpdf.so"));
+#endif
+      break;
+    case chrome::FILE_NACL_PLUGIN:
+      if (!GetInternalPluginsDirectory(&cur))
+        return false;
+#if defined(OS_WIN)
+      cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll"));
+#elif defined(OS_MACOSX)
+      // TODO(noelallen) Please verify this extention name is correct.
+      cur = cur.Append(FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin"));
+#else  // Linux and Chrome OS
+      cur = cur.Append(FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so"));
 #endif
       break;
     case chrome::FILE_RESOURCES_PACK:
diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h
index 63037c6fdaa7cf2e5ce20961405f8fd8e84ae1c5..21867bd4dd9b78dfcf4ef62fe5654498afaa4323 100644
--- a/chrome/common/chrome_paths.h
+++ b/chrome/common/chrome_paths.h
@@ -57,6 +57,7 @@ enum {
   FILE_GEARS_PLUGIN,            // Full path to the gears.dll plugin file.
   FILE_FLASH_PLUGIN,            // Full path to the internal Flash plugin file.
   FILE_PDF_PLUGIN,              // Full path to the internal PDF plugin file.
+  FILE_NACL_PLUGIN,             // Full path to the internal NaCl plugin file.
   FILE_LIBAVCODEC,              // Full path to libavcodec media decoding
                                 // library.
   FILE_LIBAVFORMAT,             // Full path to libavformat media parsing