Clean up disable_nacl

chrome/browser/nacl_host/nacl_process_host.cc

 // Copyright (c) 2011 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 "build/build_config.h"
 
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
@@ skipping 18 matching lines @@
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/nacl_host/nacl_broker_service_win.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
-#if !defined(DISABLE_NACL)
 void SetCloseOnExec(nacl::Handle fd) {
 #if defined(OS_POSIX)
   int flags = fcntl(fd, F_GETFD);
   CHECK_NE(flags, -1);
   int rc = fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
   CHECK_EQ(rc, 0);
 #endif
 }
-#endif
 
 // Represents shared state for all NaClProcessHost objects in the browser.
 // Currently this just handles holding onto the file descriptor for the IRT.
 class NaClBrowser {
  public:
   static NaClBrowser* GetInstance() {
     return Singleton<NaClBrowser>::get();
   }
 
   bool IrtAvailable() const {
@@ skipping 52 matching lines @@
 
 NaClProcessHost::NaClProcessHost(const std::wstring& url)
     : BrowserChildProcessHost(NACL_LOADER_PROCESS),
       reply_msg_(NULL),
       internal_(new NaClInternal()),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   set_name(WideToUTF16Hack(url));
 }
 
 NaClProcessHost::~NaClProcessHost() {
-  // nacl::Close() is not available at link time if DISABLE_NACL is
-  // defined, but we still compile a bunch of other code from this
-  // file anyway.  TODO(mseaborn): Make this less messy.
-#ifndef DISABLE_NACL
   for (size_t i = 0; i < internal_->sockets_for_renderer.size(); i++) {
     if (nacl::Close(internal_->sockets_for_renderer[i]) != 0) {
       LOG(ERROR) << "nacl::Close() failed";
     }
   }
   for (size_t i = 0; i < internal_->sockets_for_sel_ldr.size(); i++) {
     if (nacl::Close(internal_->sockets_for_sel_ldr[i]) != 0) {
       LOG(ERROR) << "nacl::Close() failed";
     }
   }
-#endif
 
   if (reply_msg_) {
     // The process failed to launch for some reason.
     // Don't keep the renderer hanging.
     reply_msg_->set_reply_error();
     chrome_render_message_filter_->Send(reply_msg_);
   }
 }
 
 // Attempt to ensure the IRT will be available when we need it, but don't wait.
@@ skipping 21 matching lines @@
   // Open the IRT file early to make sure that it isn't replaced out from
   // under us by autoupdate.
   NaClBrowser::GetInstance()->EnsureIrtAvailable();
 #endif
 }
 
 bool NaClProcessHost::Launch(
     ChromeRenderMessageFilter* chrome_render_message_filter,
     int socket_count,
     IPC::Message* reply_msg) {
-#ifdef DISABLE_NACL
-  NOTIMPLEMENTED() << "Native Client disabled at build time";
-  return false;
-#else
   // Place an arbitrary limit on the number of sockets to limit
   // exposure in case the renderer is compromised.  We can increase
   // this if necessary.
   if (socket_count > 8) {
     return false;
   }
 
   // Start getting the IRT open asynchronously while we launch the NaCl process.
   // We'll make sure this actually finished in OnProcessLaunched, below.
   if (!NaClBrowser::GetInstance()->EnsureIrtAvailable()) {
@@ skipping 22 matching lines @@
   }
 
   // Launch the process
   if (!LaunchSelLdr()) {
     return false;
   }
   chrome_render_message_filter_ = chrome_render_message_filter;
   reply_msg_ = reply_msg;
 
   return true;
-#endif  // DISABLE_NACL
 }
 
 bool NaClProcessHost::LaunchSelLdr() {
   if (!CreateChannel())
     return false;
 
   CommandLine::StringType nacl_loader_prefix;
 #if defined(OS_POSIX)
   nacl_loader_prefix = CommandLine::ForCurrentProcess()->GetSwitchValueNative(
       switches::kNaClLoaderCmdPrefix);
@@ skipping 291 matching lines @@
 }
 
 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
   NOTREACHED() << "Invalid message with type = " << msg.type();
   return false;
 }
 
 bool NaClProcessHost::CanShutdown() {
   return true;
 }