Only build various flash/pnacl/ppapi code when they are enabled.

Only build various flash/pnacl/ppapi code when they are enabled. (try 2)

Committed: https://crrev.com/11b815e9520584215b940e28c7c8f121d7a7afad
Cr-Commit-Position: refs/heads/master@{#291810}

[nyquist, 2014-08-25 13:58:33]

lgtm

[Lei Zhang, 2014-08-25 20:35:57]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-25 20:36:32]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/494993005/40001

[commit-bot: I haz the power, 2014-08-25 21:47:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-25 21:47:20]

Failed to apply patch for chrome/common/chrome_content_client.cc:
While running git apply --index -p1;
  error: patch failed: chrome/common/chrome_content_client.cc:34
  error: chrome/common/chrome_content_client.cc: patch does not apply

Patch:       chrome/common/chrome_content_client.cc
Index: chrome/common/chrome_content_client.cc
diff --git a/chrome/common/chrome_content_client.cc
b/chrome/common/chrome_content_client.cc
index
fde26efe605f2a4fc36338fbdbb439ee46eb9f70..81f5b16c0972b107bf89b48f7fd6cb7e18bc5c0c
100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -21,12 +21,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/crash_keys.h"
-#include "chrome/common/pepper_flash.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/common_resources.h"
 #include "components/dom_distiller/core/url_constants.h"
-#include "components/nacl/common/nacl_process_type.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/pepper_plugin_info.h"
@@ -34,12 +32,10 @@
 #include "content/public/common/user_agent.h"
 #include "extensions/common/constants.h"
 #include "gpu/config/gpu_info.h"
-#include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 
-#include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 #if defined(OS_WIN)
@@ -51,9 +47,16 @@
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/common/nacl_constants.h"
+#include "components/nacl/common/nacl_process_type.h"
 #include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h"
 #endif
 
+#if defined(ENABLE_PLUGINS)
+#include "chrome/common/pepper_flash.h"
+#include "flapper_version.h"  // In SHARED_INTERMEDIATE_DIR.
+#include "ppapi/shared_impl/ppapi_permissions.h"
+#endif
+
 #if defined(ENABLE_REMOTING)
 #include "remoting/client/plugin/pepper_entrypoints.h"
 #endif
@@ -65,6 +68,7 @@
 
 namespace {
 
+#if defined(ENABLE_PLUGINS)
 const char kPDFPluginMimeType[] = "application/pdf";
 const char kPDFPluginExtension[] = "pdf";
 const char kPDFPluginDescription[] = "Portable Document Format";
@@ -407,6 +411,7 @@ bool GetBundledPepperFlash(content::PepperPluginInfo*
plugin) {
   return false;
 #endif  // FLAPPER_AVAILABLE
 }
+#endif  // defined(ENABLE_PLUGINS)
 
 std::string GetProduct() {
   chrome::VersionInfo version_info;
@@ -457,12 +462,14 @@ void ChromeContentClient::SetGpuInfo(const gpu::GPUInfo&
gpu_info) {
 
 void ChromeContentClient::AddPepperPlugins(
     std::vector<content::PepperPluginInfo>* plugins) {
+#if defined(ENABLE_PLUGINS)
   ComputeBuiltInPlugins(plugins);
   AddPepperFlashFromCommandLine(plugins);
 
   content::PepperPluginInfo plugin;
   if (GetBundledPepperFlash(&plugin))
     plugins->push_back(plugin);
+#endif
 }
 
 void ChromeContentClient::AddAdditionalSchemes(
@@ -511,14 +518,16 @@ gfx::Image& ChromeContentClient::GetNativeImageNamed(int
resource_id) const {
 }
 
 std::string ChromeContentClient::GetProcessTypeNameInEnglish(int type) {
+#if !defined(DISABLE_NACL)
   switch (type) {
     case PROCESS_TYPE_NACL_LOADER:
       return "Native Client module";
     case PROCESS_TYPE_NACL_BROKER:
       return "Native Client broker";
   }
+#endif
 
-  DCHECK(false) << "Unknown child process type!";
+  NOTREACHED() << "Unknown child process type!";
   return "Unknown";
 }

[Lei Zhang, 2014-08-25 21:52:59]

The CQ bit was checked by thestig@chromium.org

[commit-bot: I haz the power, 2014-08-25 21:54:26]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/thestig@chromium.org/494993005/60001

[commit-bot: I haz the power, 2014-08-25 23:57:34]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  mac_chromium_rel_swarming on tryserver.chromium.mac
(http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[commit-bot: I haz the power, 2014-08-26 00:33:37]

Committed patchset #4 (60001) as 2644722172769fec940c8077b2566aeae6259ba7

[commit-bot: I haz the power, 2014-09-10 02:39:21]

Patchset 4 (id:??) landed as
https://crrev.com/11b815e9520584215b940e28c7c8f121d7a7afad
Cr-Commit-Position: refs/heads/master@{#291810}