Migrating PPB_FileIO_Dev, PPB_FileRef_Dev, and PPB_FileSystem_Dev dependencies to PPB_FileIO, PPB...

webkit/plugins/ppapi/ppb_file_io_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_FILE_IO_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_FILE_IO_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
-#include "ppapi/c/dev/pp_file_info_dev.h"
+#include "ppapi/c/pp_file_info.h"
 #include "ppapi/c/pp_time.h"
 #include "ppapi/thunk/ppb_file_io_api.h"
 #include "webkit/plugins/ppapi/callbacks.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/resource.h"
 
 struct PP_CompletionCallback;
-struct PPB_FileIO_Dev;
-struct PPB_FileIOTrusted_Dev;
+struct PPB_FileIO;
+struct PPB_FileIOTrusted;
 
 namespace webkit {
 namespace ppapi {
 
 class PluginModule;
 class PPB_FileRef_Impl;
 
 class PPB_FileIO_Impl : public Resource,
                         public ::ppapi::thunk::PPB_FileIO_API {
  public:
   explicit PPB_FileIO_Impl(PluginInstance* instance);
   virtual ~PPB_FileIO_Impl();
 
   // ResourceObjectBase overrides.
   virtual ::ppapi::thunk::PPB_FileIO_API* AsPPB_FileIO_API() OVERRIDE;
 
   // PPB_FileIO_API implementation.
   virtual int32_t Open(PP_Resource file_ref,
                        int32_t open_flags,
                        PP_CompletionCallback callback) OVERRIDE;
-  virtual int32_t Query(PP_FileInfo_Dev* info,
+  virtual int32_t Query(PP_FileInfo* info,
                         PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Touch(PP_Time last_access_time,
                         PP_Time last_modified_time,
                         PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Read(int64_t offset,
                        char* buffer,
                        int32_t bytes_to_read,
                        PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Write(int64_t offset,
                         const char* buffer,
@@ skipping 31 matching lines @@
                              base::PlatformFile file);
   void QueryInfoCallback(base::PlatformFileError error_code,
                          const base::PlatformFileInfo& file_info);
   void ReadCallback(base::PlatformFileError error_code,
                     const char* data, int bytes_read);
   void WriteCallback(base::PlatformFileError error_code, int bytes_written);
 
   base::ScopedCallbackFactory<PPB_FileIO_Impl> callback_factory_;
 
   base::PlatformFile file_;
-  PP_FileSystemType_Dev file_system_type_;
+  PP_FileSystemType file_system_type_;
 
   // Any pending callback for any PPB_FileIO(Trusted) call taking a callback.
   scoped_refptr<TrackedCompletionCallback> callback_;
 
   // Output buffer pointer for |Query()|; only non-null when a callback is
   // pending for it.
-  PP_FileInfo_Dev* info_;
+  PP_FileInfo* info_;
 
   // Pointer back to the caller's read buffer; used by |Read()|. Not owned.
   char* read_buffer_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_FileIO_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_FILE_IO_IMPL_H_