PNaCl cleanup: Remove TempFile class and use base::File instead

components/nacl/renderer/plugin/pnacl_translate_thread.h

 // 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.
 
 #ifndef COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_TRANSLATE_THREAD_H_
 #define COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_TRANSLATE_THREAD_H_
 
 #include <stdint.h>
 
 #include <deque>
 #include <vector>
 
+#include "base/files/file.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/nacl/renderer/plugin/plugin_error.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/proxy/serialized_handle.h"
 
 struct PP_PNaClOptions;
 
 namespace plugin {
 
 class NaClSubprocess;
 class PnaclCoordinator;
-class TempFile;
 
 class PnaclTranslateThread {
  public:
   PnaclTranslateThread();
   ~PnaclTranslateThread();
 
   // Set up the state for RunCompile and RunLink. When an error is
   // encountered, or RunLink is complete the finish_callback is run
   // to notify the main thread.
   void SetupState(const pp::CompletionCallback& finish_callback,
                   NaClSubprocess* compiler_subprocess,
                   NaClSubprocess* ld_subprocess,
-                  const std::vector<TempFile*>* obj_files,
+                  std::vector<base::File>* obj_files,
                   int num_threads,
-                  TempFile* nexe_file,
+                  base::File* nexe_file,
                   ErrorInfo* error_info,
                   PP_PNaClOptions* pnacl_options,
                   const std::string& architecture_attributes,
                   PnaclCoordinator* coordinator);
 
   // Create a compile thread and run/command the compiler_subprocess.
   // It will continue to run and consume data as it is passed in with PutBytes.
   // On success, runs compile_finished_callback.
   // On error, runs finish_callback.
   // The compiler_subprocess must already be loaded.
@@ skipping 19 matching lines @@
   // Called from the main thread.
   void EndStream();
 
   int64_t GetCompileTime() const { return compile_time_; }
 
   // Returns true if the translation process is initiated via SetupState.
   bool started() const { return coordinator_ != NULL; }
 
  private:
   ppapi::proxy::SerializedHandle GetHandleForSubprocess(
-      TempFile* file, int32_t open_flags, base::ProcessId peer_pid);
+      base::File* file, int32_t open_flags, base::ProcessId peer_pid);
 
   // Helper thread entry point for compilation. Takes a pointer to
   // PnaclTranslateThread and calls DoCompile().
   static void WINAPI DoCompileThread(void* arg);
   // Runs the streaming compilation. Called from the helper thread.
   void DoCompile();
 
   // Similar to DoCompile*, but for linking.
   static void WINAPI DoLinkThread(void* arg);
   void DoLink();
@@ skipping 38 matching lines @@
   // Data buffers from FileDownloader are enqueued here to pass from the
   // main thread to the SRPC thread. Protected by cond_mu_
   std::deque<std::string> data_buffers_;
   // Whether all data has been downloaded and copied to translation thread.
   // Associated with buffer_cond_
   bool done_;
 
   int64_t compile_time_;
 
   // Data about the translation files, owned by the coordinator
-  const std::vector<TempFile*>* obj_files_;
+  std::vector<base::File>* obj_files_;

[bbudge, 2016/01/21 18:37:38]

Have you considered making this a const ref? Or is there something about
base::File that makes this impossible?

Same for nexe_file_ though to a lesser extent.

[Mark Seaborn, 2016/01/21 19:18:21]

I started off keeping the 'const', but it didn't work because we call
base::File::Seek(), and that currently requires a non-const base::File.

That would work for a "const std::vector<base::File*>", but not for a "const
std::vector<base::File>".

This is kind of arbitrary, because Seek() doesn't modify the base::File itself,
it modifies the FD that the base::File points to.

Seek() could have a 'const' qualifier added to it, in principle, but people
aren't always consistent about whether they want 'const' to be transitive, so
it's not clear what people would expect it to mean for a base::File.

   int num_threads_;
-  TempFile* nexe_file_;
+  base::File* nexe_file_;
   ErrorInfo* coordinator_error_info_;
   PP_PNaClOptions* pnacl_options_;
   std::string architecture_attributes_;
   PnaclCoordinator* coordinator_;
 
   // These IPC::SyncChannels can only be used and freed by the parent thread.
   scoped_ptr<IPC::SyncChannel> compiler_channel_;
   scoped_ptr<IPC::SyncChannel> ld_channel_;
   // These IPC::SyncMessageFilters can be used by the child thread.
   scoped_refptr<IPC::SyncMessageFilter> compiler_channel_filter_;
   scoped_refptr<IPC::SyncMessageFilter> ld_channel_filter_;
   // PIDs of the subprocesses, needed for copying handles to the subprocess
   // on Windows.  These are used by the child thread.
   base::ProcessId compiler_channel_peer_pid_;
   base::ProcessId ld_channel_peer_pid_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread);
 };
 
 }
 #endif // COMPONENTS_NACL_RENDERER_PLUGIN_PNACL_TRANSLATE_THREAD_H_