Merge 242646 "Pepper: FileIO holds FileSystem ref with scoped_re..."

ppapi/proxy/file_io_resource.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 PPAPI_PROXY_FILE_IO_RESOURCE_H_
 #define PPAPI_PROXY_FILE_IO_RESOURCE_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 146 matching lines @@
                                   const ResourceMessageReplyParams& params);
   void OnPluginMsgOpenFileComplete(scoped_refptr<TrackedCallback> callback,
                                    const ResourceMessageReplyParams& params);
   void OnPluginMsgRequestOSFileHandleComplete(
       scoped_refptr<TrackedCallback> callback,
       PP_FileHandle* output_handle,
       const ResourceMessageReplyParams& params);
 
   scoped_refptr<FileHandleHolder> file_handle_;
   PP_FileSystemType file_system_type_;
-  ScopedPPResource file_system_resource_;
+  scoped_refptr<Resource> file_system_resource_;
+  bool called_close_;
   FileIOStateManager state_manager_;
 
   scoped_refptr<Resource> file_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(FileIOResource);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_FILE_IO_RESOURCE_H_