| Index: components/nacl/browser/pnacl_host.h
|
| diff --git a/components/nacl/browser/pnacl_host.h b/components/nacl/browser/pnacl_host.h
|
| index c013a4f39ff6e578b6d8e1286c6507f52a8cba48..804b4d803704173d51d4d00fdc4306de3e6a017d 100644
|
| --- a/components/nacl/browser/pnacl_host.h
|
| +++ b/components/nacl/browser/pnacl_host.h
|
| @@ -102,6 +102,7 @@ class PnaclHost {
|
| // so that the BrowsingDataRemover can clear it even if no translation has
|
| // ever been started.
|
| friend struct DefaultSingletonTraits<PnaclHost>;
|
| + friend class FileProxy;
|
| friend class pnacl::PnaclHostTest;
|
| friend class pnacl::PnaclHostTestDisk;
|
| enum CacheState {
|
| @@ -115,7 +116,7 @@ class PnaclHost {
|
| ~PendingTranslation();
|
| base::ProcessHandle process_handle;
|
| int render_view_id;
|
| - base::PlatformFile nexe_fd;
|
| + base::File* nexe_fd;
|
| bool got_nexe_fd;
|
| bool got_cache_reply;
|
| bool got_cache_hit;
|
| @@ -149,16 +150,16 @@ class PnaclHost {
|
| // GetNexeFd miss path
|
| void ReturnMiss(const PendingTranslationMap::iterator& entry);
|
| static scoped_refptr<net::DrainableIOBuffer> CopyFileToBuffer(
|
| - base::PlatformFile fd);
|
| + scoped_ptr<base::File> file);
|
| void StoreTranslatedNexe(TranslationID id,
|
| scoped_refptr<net::DrainableIOBuffer>);
|
| void OnTranslatedNexeStored(const TranslationID& id, int net_error);
|
| void RequeryMatchingTranslations(const std::string& key);
|
|
|
| // GetNexeFd hit path
|
| - static int CopyBufferToFile(base::PlatformFile fd,
|
| - scoped_refptr<net::DrainableIOBuffer> buffer);
|
| - void OnBufferCopiedToTempFile(const TranslationID& id, int file_error);
|
| + void OnBufferCopiedToTempFile(const TranslationID& id,
|
| + scoped_ptr<base::File> file,
|
| + int file_error);
|
|
|
| void OnEntriesDoomed(const base::Closure& callback, int net_error);
|
|
|
|
|