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

webkit/plugins/ppapi/ppb_file_system_impl.h

Index: webkit/plugins/ppapi/ppb_file_system_impl.h
===================================================================
--- webkit/plugins/ppapi/ppb_file_system_impl.h	(revision 91558)
+++ webkit/plugins/ppapi/ppb_file_system_impl.h	(working copy)
@@ -8,11 +8,11 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "googleurl/src/gurl.h"
-#include "ppapi/c/dev/pp_file_info_dev.h"
+#include "ppapi/c/pp_file_info.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 #include "webkit/plugins/ppapi/resource.h"
 
-struct PPB_FileSystem_Dev;
+struct PPB_FileSystem;
 
 namespace webkit {
 namespace ppapi {
@@ -22,17 +22,17 @@
 class PPB_FileSystem_Impl : public Resource,
                             public ::ppapi::thunk::PPB_FileSystem_API {
  public:
-  PPB_FileSystem_Impl(PluginInstance* instance, PP_FileSystemType_Dev type);
+  PPB_FileSystem_Impl(PluginInstance* instance, PP_FileSystemType type);
   virtual ~PPB_FileSystem_Impl();
 
   static PP_Resource Create(PluginInstance* instance,
-                            PP_FileSystemType_Dev type);
+                            PP_FileSystemType type);
 
   // ResourceObjectBase overrides.
   virtual ::ppapi::thunk::PPB_FileSystem_API* AsPPB_FileSystem_API() OVERRIDE;
 
   PluginInstance* instance() { return instance_; }
-  PP_FileSystemType_Dev type() { return type_; }
+  PP_FileSystemType type() { return type_; }
   const GURL& root_url() const { return root_url_; }
   void set_root_url(const GURL& root_url) { root_url_ = root_url; }
   bool opened() const { return opened_; }
@@ -41,11 +41,11 @@
   // PPB_FileSystem_API implementation.
   virtual int32_t Open(int64_t expected_size,
                        PP_CompletionCallback callback) OVERRIDE;
-  virtual PP_FileSystemType_Dev GetType() OVERRIDE;
+  virtual PP_FileSystemType GetType() OVERRIDE;
 
  private:
   PluginInstance* instance_;
-  PP_FileSystemType_Dev type_;
+  PP_FileSystemType type_;
   GURL root_url_;
   bool opened_;
   bool called_open_;