Cleanup: Only define various NaCl flags when PPAPI is enabled.

Review URL: https://codereview.chromium.org/431833002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287406 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/about_flags.cc

@@ -961,8 +961,7 @@ const Experiment kExperiments[] = {
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableDownloadResumption)
   },
-  // Native client is compiled out when DISABLE_NACL is defined.
-#if !defined(DISABLE_NACL)
+#if defined(ENABLE_PLUGINS)
   {
     "allow-nacl-socket-api",
     IDS_FLAGS_ALLOW_NACL_SOCKET_API_NAME,

chrome/browser/chrome_content_browser_client.cc

@@ -1320,9 +1320,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
       extensions::switches::kEnableScriptsRequireAction,
       extensions::switches::kExtensionsOnChromeURLs,
       extensions::switches::kWhitelistedExtensionID,
-      // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
-      // to browser.
-      switches::kAllowNaClFileHandleAPI,
       switches::kAppsCheckoutURL,
       switches::kAppsGalleryURL,
       switches::kCloudPrintURL,

chrome/common/chrome_switches.cc

@@ -33,6 +33,7 @@ const char kAllowFileAccess[]               = "allow-file-access";
 // extension API.
 const char kAllowHttpScreenCapture[] = "allow-http-screen-capture";
 
+#if defined(ENABLE_PLUGINS)
 // Specifies comma-separated list of extension ids or hosts to grant
 // access to CRX file system APIs.
 const char kAllowNaClCrxFsAPI[]             = "allow-nacl-crxfs-api";
@@ -44,6 +45,7 @@ const char kAllowNaClFileHandleAPI[]        = "allow-nacl-file-handle-api";
 // Specifies comma-separated list of extension ids or hosts to grant
 // access to TCP/UDP socket APIs.
 const char kAllowNaClSocketAPI[]            = "allow-nacl-socket-api";
+#endif
 
 // Don't block outdated plugins.
 const char kAllowOutdatedPlugins[]          = "allow-outdated-plugins";

chrome/common/chrome_switches.h

@@ -30,9 +30,6 @@ namespace switches {
 extern const char kAllowCrossOriginAuthPrompt[];
 extern const char kAllowFileAccess[];
 extern const char kAllowHttpScreenCapture[];
-extern const char kAllowNaClCrxFsAPI[];
-extern const char kAllowNaClFileHandleAPI[];
-extern const char kAllowNaClSocketAPI[];
 extern const char kAllowOutdatedPlugins[];
 extern const char kAllowRunningInsecureContent[];
 extern const char kAlternateProtocolProbabilityThreshold[];
@@ -404,6 +401,12 @@ extern const char kWindows8Search[];
 extern const char kDebugPrint[];
 #endif
 
+#if defined(ENABLE_PLUGINS)
+extern const char kAllowNaClCrxFsAPI[];
+extern const char kAllowNaClFileHandleAPI[];
+extern const char kAllowNaClSocketAPI[];
+#endif
+
 #ifndef NDEBUG
 extern const char kFileManagerExtensionPath[];
 #endif