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

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Index: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index 615fa34857adbb8324bde6f0cfbd8446e476315d..641ea182807c25be3cd536f22800967306d79ba5 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/component_updater/component_updater_resource_throttle.h"
+#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_resource_throttle.h"
@@ -52,10 +53,6 @@
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
-#if !defined(DISABLE_NACL)
-#include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"
-#endif
-
 #if defined(ENABLE_CONFIGURATION_POLICY)
 #include "components/policy/core/common/cloud/policy_header_io_helper.h"
 #endif
@@ -226,7 +223,6 @@
 }
 #endif  // !defined(OS_ANDROID)
 
-#if !defined(DISABLE_NACL)
 void AppendComponentUpdaterThrottles(
     net::URLRequest* request,
     content::ResourceContext* resource_context,
@@ -255,9 +251,8 @@
         component_updater::GetOnDemandResourceThrottle(cus, crx_id));
   }
 }
-#endif  // !defined(DISABLE_NACL)
-
-}  // namespace
+
+}  // end namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate(
     prerender::PrerenderTracker* prerender_tracker)
@@ -407,14 +402,12 @@
                                   resource_context,
                                   resource_type,
                                   throttles);
-#if defined(ENABLE_PLUGINS)
   if (!is_prerendering) {
     AppendComponentUpdaterThrottles(request,
                                     resource_context,
                                     resource_type,
                                     throttles);
   }
-#endif
 }
 
 void ChromeResourceDispatcherHostDelegate::DownloadStarting(