Pepper: Remove trusted plugin loadable module.

chrome/common/chrome_paths.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/chrome_paths.h"
 
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
@@ skipping 42 matching lines @@
 // File name of the internal PDF plugin on different platforms.
 const base::FilePath::CharType kInternalPDFPluginFileName[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("pdf.dll");
 #elif defined(OS_MACOSX)
     FILE_PATH_LITERAL("PDF.plugin");
 #else  // Linux and Chrome OS
     FILE_PATH_LITERAL("libpdf.so");
 #endif
 
-// File name of the internal NaCl plugin on different platforms.
 const base::FilePath::CharType kInternalNaClPluginFileName[] =

[Mark Seaborn, 2014/07/28 20:28:36]

Is it difficult to remove the use of kInternalNaClPluginFileName rather than
making this a dummy value?

[teravest, 2014/07/28 22:04:21]

Yes, there's some more work involved that I'd rather do in a separate change.
TODOs added.

-#if defined(OS_WIN)
-    FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.dll");
-#elif defined(OS_MACOSX)
-    // TODO(noelallen) Please verify this extention name is correct.
-    FILE_PATH_LITERAL("ppGoogleNaClPluginChrome.plugin");
-#else  // Linux and Chrome OS
-    FILE_PATH_LITERAL("libppGoogleNaClPluginChrome.so");
-#endif
+    FILE_PATH_LITERAL("internal-nacl-plugin");
 
 const base::FilePath::CharType kEffectsPluginFileName[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("pepper/libppeffects.dll");
 #elif defined(OS_MACOSX)
     FILE_PATH_LITERAL("pepper/libppeffects.plugin");
 #else  // Linux and Chrome OS
     FILE_PATH_LITERAL("pepper/libppeffects.so");
 #endif
 
@@ skipping 225 matching lines @@
       cur = cur.Append(kInternalPDFPluginFileName);
       break;
     case chrome::FILE_EFFECTS_PLUGIN:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.Append(kEffectsPluginFileName);
       break;
     case chrome::FILE_NACL_PLUGIN:
       if (!GetInternalPluginsDirectory(&cur))
         return false;
       cur = cur.Append(kInternalNaClPluginFileName);

[Mark Seaborn, 2014/07/28 20:28:36]

The use is here...  If it's difficult to remove FILE_NACL_PLUGIN, maybe add a
TODO comment saying what it's still used for?

[teravest, 2014/07/28 22:04:22]

I've added a TODO here.

       break;
     // PNaCl is currenly installable via the component updater or by being
     // simply built-in.  DIR_PNACL_BASE is used as the base directory for
     // installation via component updater.  DIR_PNACL_COMPONENT will be
     // the final location of pnacl, which is a subdir of DIR_PNACL_BASE.
     case chrome::DIR_PNACL_BASE:
       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
       break;
@@ skipping 275 matching lines @@
 
 void SetInvalidSpecifiedUserDataDir(const base::FilePath& user_data_dir) {
   g_invalid_specified_user_data_dir.Get() = user_data_dir;
 }
 
 const base::FilePath& GetInvalidSpecifiedUserDataDir() {
   return g_invalid_specified_user_data_dir.Get();
 }
 
 }  // namespace chrome