NaCl: Don't use DISABLE_NACL inside components/nacl

enabling and disabling building of those files is controlled via gyp:
https://code.google.com/p/chromium/codesearch#chromium/src/components/nacl.gyp&l=71

BUG=none

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

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

5 files changed, 0 insertions, 14 deletions

diff --git a/components/nacl/browser/nacl_host_message_filter.cc b/components/nacl/browser/nacl_host_message_filter.cc
index 92193dc..9e85266 100644
--- a/components/nacl/browser/nacl_host_message_filter.cc
+++ b/components/nacl/browser/nacl_host_message_filter.cc
@@ -68,7 +68,6 @@ net::HostResolver* NaClHostMessageFilter::GetHostResolver() {
   return request_context_->GetURLRequestContext()->host_resolver();
 }
 
-#if !defined(DISABLE_NACL)
 void NaClHostMessageFilter::OnLaunchNaCl(
     const nacl::NaClLaunchParams& launch_params,
     IPC::Message* reply_msg) {
@@ -181,6 +180,5 @@ void NaClHostMessageFilter::OnOpenNaClExecutable(int render_view_id,
   nacl_file_host::OpenNaClExecutable(this, render_view_id, file_url,
                                      reply_msg);
 }
-#endif
 
 }  // namespace nacl
diff --git a/components/nacl/browser/nacl_host_message_filter.h b/components/nacl/browser/nacl_host_message_filter.h
index ea608e1..c7bf900 100644
--- a/components/nacl/browser/nacl_host_message_filter.h
+++ b/components/nacl/browser/nacl_host_message_filter.h
@@ -48,7 +48,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
 
   virtual ~NaClHostMessageFilter();
 
-#if !defined(DISABLE_NACL)
   void OnLaunchNaCl(const NaClLaunchParams& launch_params,
                     IPC::Message* reply_msg);
   void OnGetReadonlyPnaclFd(const std::string& filename,
@@ -68,7 +67,6 @@ class NaClHostMessageFilter : public content::BrowserMessageFilter {
   void AsyncReturnTemporaryFile(int pp_instance,
                                 base::PlatformFile fd,
                                 bool is_hit);
-#endif
   int render_process_id_;
 
   // off_the_record_ is copied from the profile partly so that it can be
diff --git a/components/nacl/renderer/pnacl_translation_resource_host.cc b/components/nacl/renderer/pnacl_translation_resource_host.cc
index 0546c75..223bcc6 100644
--- a/components/nacl/renderer/pnacl_translation_resource_host.cc
+++ b/components/nacl/renderer/pnacl_translation_resource_host.cc
@@ -4,7 +4,6 @@
 
 #include "pnacl_translation_resource_host.h"
 
-#ifndef DISABLE_NACL
 #include "components/nacl/common/nacl_host_messages.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
@@ -164,5 +163,3 @@ void PnaclTranslationResourceHost::CleanupCacheRequests() {
   }
   pending_cache_requests_.clear();
 }
-
-#endif  // DISABLE_NACL
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index 8730878..0875886 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -4,8 +4,6 @@
 
 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
 
-#ifndef DISABLE_NACL
-
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ -628,5 +626,3 @@ const PPB_NaCl_Private* GetNaClPrivateInterface() {
 }
 
 }  // namespace nacl
-
-#endif  // DISABLE_NACL
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.h b/components/nacl/renderer/ppb_nacl_private_impl.h
index 717abce..3e632ea 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.h
+++ b/components/nacl/renderer/ppb_nacl_private_impl.h
@@ -7,7 +7,6 @@
 
 #include "build/build_config.h"
 
-#ifndef DISABLE_NACL
 #include "ppapi/c/private/ppb_nacl_private.h"
 
 namespace nacl {
@@ -16,6 +15,4 @@ const PPB_NaCl_Private* GetNaClPrivateInterface();
 
 }  // namespace nacl
 
-#endif  // DISABLE_NACL
-
 #endif  // COMPONENTS_NACL_RENDERER_PPB_NACL_PRIVATE_IMPL_H_