RefCounted types should not have public destructors, delegate cleanup

chrome/browser/nacl_host/nacl_process_host.cc

 // Copyright (c) 2012 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 "chrome/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 312 matching lines @@
     cmd_line->AppendArgNative(script.value());
   }
   cmd_line->AppendArg("--args");
   const CommandLine::StringVector& argv = line->argv();
   for (size_t i = 0; i < argv.size(); i++) {
     cmd_line->AppendArgNative(argv[i]);
   }
   return scoped_ptr<CommandLine>(cmd_line);
 }
 #elif defined(OS_LINUX)
-namespace {
-class NaClGdbWatchDelegate : public MessageLoopForIO::Watcher {
+class NaClProcessHost::NaClGdbWatchDelegate
+    : public MessageLoopForIO::Watcher {
  public:
   // fd_write_ is used by nacl-gdb via /proc/browser_PID/fd/fd_write_
   NaClGdbWatchDelegate(int fd_read, int fd_write,
                        const base::Closure& reply)
       : fd_read_(fd_read),
         fd_write_(fd_write),
         reply_(reply) {}
 
   ~NaClGdbWatchDelegate() {
     if (HANDLE_EINTR(close(fd_read_)) != 0)
       DLOG(ERROR) << "close(fd_read_) failed";
     if (HANDLE_EINTR(close(fd_write_)) != 0)
       DLOG(ERROR) << "close(fd_write_) failed";
   }
 
   virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE;
   virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE {}
 
  private:
   int fd_read_;
   int fd_write_;
   base::Closure reply_;
 };
 
-void NaClGdbWatchDelegate::OnFileCanReadWithoutBlocking(int fd) {
+void NaClProcessHost::NaClGdbWatchDelegate::OnFileCanReadWithoutBlocking(
+    int fd) {
   char buf;
   if (HANDLE_EINTR(read(fd_read_, &buf, 1)) != 1 || buf != '\0')
     LOG(ERROR) << "Failed to sync with nacl-gdb";
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE, reply_);
 }
-}  // namespace
 
 bool NaClProcessHost::LaunchNaClGdb(base::ProcessId pid) {
   CommandLine::StringType nacl_gdb =
       CommandLine::ForCurrentProcess()->GetSwitchValueNative(
           switches::kNaClGdb);
   CommandLine::StringVector argv;
   // We don't support spaces inside arguments in --nacl-gdb switch.
   base::SplitString(nacl_gdb, static_cast<CommandLine::CharType>(' '), &argv);
   CommandLine cmd_line(argv);
   cmd_line.AppendArg("--eval-command");
@@ skipping 406 matching lines @@
   } else {
     NaClStartDebugExceptionHandlerThread(
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif