Remaining cleanup (base::Bind): Replacing FileUtilProxy calls with new callback

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>
 #endif
 
+#include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
@@ skipping 26 matching lines @@
 struct NaClProcessHost::NaClInternal {
   std::vector<nacl::Handle> sockets_for_renderer;
   std::vector<nacl::Handle> sockets_for_sel_ldr;
 };
 
 NaClProcessHost::NaClProcessHost(const std::wstring& url)
     : BrowserChildProcessHost(NACL_LOADER_PROCESS),
       reply_msg_(NULL),
       internal_(new NaClInternal()),
       running_on_wow64_(false),
-      ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   set_name(WideToUTF16Hack(url));
 #if defined(OS_WIN)
   running_on_wow64_ = (base::win::OSInfo::GetInstance()->wow64_status() ==
       base::win::OSInfo::WOW64_ENABLED);
 #endif
 }
 
 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
@@ skipping 186 matching lines @@
   } else {
     FilePath plugin_dir;
     if (!PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &plugin_dir)) {
       LOG(ERROR) << "Failed to locate the plugins directory";
       delete this;
       return;
     }
     irt_path = plugin_dir.Append(GetIrtLibraryFilename());
   }
 
-  base::FileUtilProxy::CreateOrOpenCallback* callback =
-      callback_factory_.NewCallback(&NaClProcessHost::OpenIrtFileDone);
   if (!base::FileUtilProxy::CreateOrOpen(
            BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
            irt_path,
            base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
-           callback)) {
+           base::Bind(&NaClProcessHost::OpenIrtFileDone,
+                      weak_factory_.GetWeakPtr()))) {
     delete this;
   }
 }
 
 void NaClProcessHost::OpenIrtFileDone(base::PlatformFileError error_code,
                                       base::PassPlatformFile file,
                                       bool created) {
   std::vector<nacl::FileDescriptor> handles_for_renderer;
   base::ProcessHandle nacl_process_handle;
   bool have_irt_file = false;
@@ skipping 113 matching lines @@
 }
 
 bool NaClProcessHost::OnMessageReceived(const IPC::Message& msg) {
   NOTREACHED() << "Invalid message with type = " << msg.type();
   return false;
 }
 
 bool NaClProcessHost::CanShutdown() {
   return true;
 }