Revert of Implement ScopedFD in terms of ScopedGeneric.

content/child/npapi/np_channel_base.cc

 // Copyright 2013 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 "content/child/npapi/np_channel_base.h"
 
 #include "base/auto_reset.h"
 #include "base/containers/hash_tables.h"
-#include "base/files/scoped_file.h"
 #include "base/lazy_instance.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_local.h"
 #include "ipc/ipc_sync_message.h"
 
 #if defined(OS_POSIX)
 #include "base/file_util.h"
 #include "ipc/ipc_channel_posix.h"
 #endif
 
@@ skipping 42 matching lines @@
 }  // namespace
 
 NPChannelBase* NPChannelBase::GetChannel(
     const IPC::ChannelHandle& channel_handle, IPC::Channel::Mode mode,
     ChannelFactory factory, base::MessageLoopProxy* ipc_message_loop,
     bool create_pipe_now, base::WaitableEvent* shutdown_event) {
 #if defined(OS_POSIX)
   // On POSIX the channel_handle conveys an FD (socket) which is duped by the
   // kernel during the IPC message exchange (via the SCM_RIGHTS mechanism).
   // Ensure we do not leak this FD.
-  base::ScopedFD fd(channel_handle.socket.auto_close ?
-                    channel_handle.socket.fd : -1);
+  int fd = channel_handle.socket.auto_close ? channel_handle.socket.fd : -1;
+  file_util::ScopedFD auto_close_fd(&fd);
 #endif
 
   scoped_refptr<NPChannelBase> channel;
   std::string channel_key = channel_handle.name;
   ChannelMap::const_iterator iter = GetChannelMap()->find(channel_key);
   if (iter == GetChannelMap()->end()) {
     channel = factory();
   } else {
     channel = iter->second;
   }
 
   DCHECK(channel.get() != NULL);
 
   if (!channel->channel_valid()) {
     channel->channel_handle_ = channel_handle;
 #if defined(OS_POSIX)
-    ignore_result(fd.release());
+    ignore_result(auto_close_fd.release());
 #endif
     if (mode & IPC::Channel::MODE_SERVER_FLAG) {
       channel->channel_handle_.name =
           IPC::Channel::GenerateVerifiedChannelID(channel_key);
     }
     channel->mode_ = mode;
     if (channel->Init(ipc_message_loop, create_pipe_now, shutdown_event)) {
       (*GetChannelMap())[channel_key] = channel;
     } else {
       channel = NULL;
@@ skipping 276 matching lines @@
   RouteToOwnerMap::iterator iter = route_to_owner_.find(route_id);
   return iter != route_to_owner_.end() ? iter->second : default_owner_;
 }
 
 int NPChannelBase::GetExistingRouteForNPObjectOwner(NPP owner) {
   OwnerToRouteMap::iterator iter = owner_to_route_.find(owner);
   return iter != owner_to_route_.end() ? iter->second : MSG_ROUTING_NONE;
 }
 
 }  // namespace content