Migrating PPB_FileIO_Dev, PPB_FileRef_Dev, and PPB_FileSystem_Dev dependencies to PPB_FileIO, PPB_FileRef, and PPB_FileSystem.

Also fixed some lint errors.
Review URL: http://codereview.chromium.org/7248047

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91733 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 32 insertions, 33 deletions

diff --git a/ppapi/thunk/ppb_file_io_api.h b/ppapi/thunk/ppb_file_io_api.h
index 52007fa..4712d28 100644
--- a/ppapi/thunk/ppb_file_io_api.h
+++ b/ppapi/thunk/ppb_file_io_api.h
@@ -5,7 +5,7 @@
 #ifndef PPAPI_THUNK_PPB_FILE_IO_API_H_
 #define PPAPI_THUNK_PPB_FILE_IO_API_H_
 
-#include "ppapi/c/dev/ppb_file_io_dev.h"
+#include "ppapi/c/ppb_file_io.h"
 
 namespace ppapi {
 namespace thunk {
@@ -17,7 +17,7 @@ class PPB_FileIO_API {
   virtual int32_t Open(PP_Resource file_ref,
                        int32_t open_flags,
                        PP_CompletionCallback callback) = 0;
-  virtual int32_t Query(PP_FileInfo_Dev* info,
+  virtual int32_t Query(PP_FileInfo* info,
                         PP_CompletionCallback callback) = 0;
   virtual int32_t Touch(PP_Time last_access_time,
                         PP_Time last_modified_time,
diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc
index 5c1f935..4882bdf 100644
--- a/ppapi/thunk/ppb_file_io_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_thunk.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/ppb_file_io_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/common.h"
@@ -40,7 +39,7 @@ int32_t Open(PP_Resource file_io,
 }
 
 int32_t Query(PP_Resource file_io,
-              PP_FileInfo_Dev* info,
+              PP_FileInfo* info,
               PP_CompletionCallback callback) {
   EnterResource<PPB_FileIO_API> enter(file_io, true);
   if (enter.failed())
@@ -112,7 +111,7 @@ void Close(PP_Resource file_io) {
     enter.object()->Close();
 }
 
-const PPB_FileIO_Dev g_ppb_file_io_thunk = {
+const PPB_FileIO g_ppb_file_io_thunk = {
   &Create,
   &IsFileIO,
   &Open,
@@ -127,7 +126,7 @@ const PPB_FileIO_Dev g_ppb_file_io_thunk = {
 
 }  // namespace
 
-const PPB_FileIO_Dev* GetPPB_FileIO_Thunk() {
+const PPB_FileIO* GetPPB_FileIO_Thunk() {
   return &g_ppb_file_io_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_io_trusted_thunk.cc b/ppapi/thunk/ppb_file_io_trusted_thunk.cc
index 38ad460..e1789bd 100644
--- a/ppapi/thunk/ppb_file_io_trusted_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_trusted_thunk.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
@@ -44,7 +44,7 @@ int32_t WillSetLength(PP_Resource file_io,
   return MayForceCallback(callback, result);
 }
 
-const PPB_FileIOTrusted_Dev g_ppb_file_io_trusted_thunk = {
+const PPB_FileIOTrusted g_ppb_file_io_trusted_thunk = {
   &GetOSFileDescriptor,
   &WillWrite,
   &WillSetLength
@@ -52,7 +52,7 @@ const PPB_FileIOTrusted_Dev g_ppb_file_io_trusted_thunk = {
 
 }  // namespace
 
-const PPB_FileIOTrusted_Dev* GetPPB_FileIOTrusted_Thunk() {
+const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk() {
   return &g_ppb_file_io_trusted_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_ref_api.h b/ppapi/thunk/ppb_file_ref_api.h
index 60442fb..be46cef 100644
--- a/ppapi/thunk/ppb_file_ref_api.h
+++ b/ppapi/thunk/ppb_file_ref_api.h
@@ -5,7 +5,7 @@
 #ifndef PPAPI_THUNK_PPB_FILE_REF_API_H_
 #define PPAPI_THUNK_PPB_FILE_REF_API_H_
 
-#include "ppapi/c/dev/ppb_file_ref_dev.h"
+#include "ppapi/c/ppb_file_ref.h"
 
 namespace ppapi {
 namespace thunk {
@@ -14,7 +14,7 @@ class PPB_FileRef_API {
  public:
   virtual ~PPB_FileRef_API() {}
 
-  virtual PP_FileSystemType_Dev GetFileSystemType() const = 0;
+  virtual PP_FileSystemType GetFileSystemType() const = 0;
   virtual PP_Var GetName() const = 0;
   virtual PP_Var GetPath() const = 0;
   virtual PP_Resource GetParent() = 0;
diff --git a/ppapi/thunk/ppb_file_ref_thunk.cc b/ppapi/thunk/ppb_file_ref_thunk.cc
index af8de13..542a7c7 100644
--- a/ppapi/thunk/ppb_file_ref_thunk.cc
+++ b/ppapi/thunk/ppb_file_ref_thunk.cc
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/pp_file_info_dev.h"
-#include "ppapi/c/dev/ppb_file_ref_dev.h"
+#include "ppapi/c/pp_file_info.h"
+#include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/common.h"
@@ -29,7 +29,7 @@ PP_Bool IsFileRef(PP_Resource resource) {
   return PP_FromBool(enter.succeeded());
 }
 
-PP_FileSystemType_Dev GetFileSystemType(PP_Resource file_ref) {
+PP_FileSystemType GetFileSystemType(PP_Resource file_ref) {
   EnterResource<PPB_FileRef_API> enter(file_ref, true);
   if (enter.failed())
     return PP_FILESYSTEMTYPE_INVALID;
@@ -98,7 +98,7 @@ int32_t Rename(PP_Resource file_ref,
   return MayForceCallback(callback, result);
 }
 
-const PPB_FileRef_Dev g_ppb_file_ref_thunk = {
+const PPB_FileRef g_ppb_file_ref_thunk = {
   &Create,
   &IsFileRef,
   &GetFileSystemType,
@@ -113,7 +113,7 @@ const PPB_FileRef_Dev g_ppb_file_ref_thunk = {
 
 }  // namespace
 
-const PPB_FileRef_Dev* GetPPB_FileRef_Thunk() {
+const PPB_FileRef* GetPPB_FileRef_Thunk() {
   return &g_ppb_file_ref_thunk;
 }
 
diff --git a/ppapi/thunk/ppb_file_system_api.h b/ppapi/thunk/ppb_file_system_api.h
index e4c9c8e..096d072 100644
--- a/ppapi/thunk/ppb_file_system_api.h
+++ b/ppapi/thunk/ppb_file_system_api.h
@@ -5,7 +5,7 @@
 #ifndef PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_
 #define PPAPI_THUNK_PPB_FILE_SYSTEM_API_H_
 
-#include "ppapi/c/dev/ppb_file_system_dev.h"
+#include "ppapi/c/ppb_file_system.h"
 
 namespace ppapi {
 namespace thunk {
@@ -16,7 +16,7 @@ class PPB_FileSystem_API {
 
   virtual int32_t Open(int64_t expected_size,
                        PP_CompletionCallback callback) = 0;
-  virtual PP_FileSystemType_Dev GetType() = 0;
+  virtual PP_FileSystemType GetType() = 0;
 };
 
 }  // namespace thunk
diff --git a/ppapi/thunk/ppb_file_system_thunk.cc b/ppapi/thunk/ppb_file_system_thunk.cc
index 0d4099e..ad2c8db 100644
--- a/ppapi/thunk/ppb_file_system_thunk.cc
+++ b/ppapi/thunk/ppb_file_system_thunk.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_system.h"
 #include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
@@ -16,7 +16,7 @@ namespace thunk {
 
 namespace {
 
-PP_Resource Create(PP_Instance instance, PP_FileSystemType_Dev type) {
+PP_Resource Create(PP_Instance instance, PP_FileSystemType type) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return 0;
@@ -38,14 +38,14 @@ int32_t Open(PP_Resource file_system,
   return MayForceCallback(callback, result);
 }
 
-PP_FileSystemType_Dev GetType(PP_Resource file_system) {
+PP_FileSystemType GetType(PP_Resource file_system) {
   EnterResource<PPB_FileSystem_API> enter(file_system, true);
   if (enter.failed())
     return PP_FILESYSTEMTYPE_INVALID;
   return enter.object()->GetType();
 }
 
-const PPB_FileSystem_Dev g_ppb_file_system_thunk = {
+const PPB_FileSystem g_ppb_file_system_thunk = {
   &Create,
   &IsFileSystem,
   &Open,
@@ -54,7 +54,7 @@ const PPB_FileSystem_Dev g_ppb_file_system_thunk = {
 
 }  // namespace
 
-const PPB_FileSystem_Dev* GetPPB_FileSystem_Thunk() {
+const PPB_FileSystem* GetPPB_FileSystem_Thunk() {
   return &g_ppb_file_system_thunk;
 }
 
diff --git a/ppapi/thunk/resource_creation_api.h b/ppapi/thunk/resource_creation_api.h
index e2e5ba1..0925b59 100644
--- a/ppapi/thunk/resource_creation_api.h
+++ b/ppapi/thunk/resource_creation_api.h
@@ -6,7 +6,6 @@
 #define PPAPI_THUNK_RESOURCE_CREATION_API_H_
 
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
-#include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/dev/ppb_graphics_3d_dev.h"
 #include "ppapi/c/dev/ppb_video_layer_dev.h"
 #include "ppapi/c/pp_bool.h"
@@ -14,6 +13,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
+#include "ppapi/c/ppb_file_system.h"
 #include "ppapi/c/ppb_image_data.h"
 #include "ppapi/proxy/interface_id.h"
 
@@ -59,7 +59,7 @@ class ResourceCreationAPI {
   virtual PP_Resource CreateFileRef(PP_Resource file_system,
                                     const char* path) = 0;
   virtual PP_Resource CreateFileSystem(PP_Instance instance,
-                                       PP_FileSystemType_Dev type) = 0;
+                                       PP_FileSystemType type) = 0;
   virtual PP_Resource CreateFlashMenu(PP_Instance instance,
                                       const PP_Flash_Menu* menu_data) = 0;
   virtual PP_Resource CreateFlashNetConnector(PP_Instance instance) = 0;
diff --git a/ppapi/thunk/thunk.h b/ppapi/thunk/thunk.h
index bcd5caa..b02b920 100644
--- a/ppapi/thunk/thunk.h
+++ b/ppapi/thunk/thunk.h
@@ -17,10 +17,10 @@ struct PPB_Context3DTrusted_Dev;
 struct PPB_CursorControl_Dev;
 struct PPB_DirectoryReader_Dev;
 struct PPB_FileChooser_Dev;
-struct PPB_FileIO_Dev;
-struct PPB_FileIOTrusted_Dev;
-struct PPB_FileRef_Dev;
-struct PPB_FileSystem_Dev;
+struct PPB_FileIO;
+struct PPB_FileIOTrusted;
+struct PPB_FileRef;
+struct PPB_FileSystem;
 struct PPB_Find_Dev;
 struct PPB_Flash_Menu;
 struct PPB_Flash_NetConnector;
@@ -75,10 +75,10 @@ const PPB_Context3DTrusted_Dev* GetPPB_Context3DTrusted_Thunk();
 const PPB_CursorControl_Dev* GetPPB_CursorControl_Thunk();
 const PPB_DirectoryReader_Dev* GetPPB_DirectoryReader_Thunk();
 const PPB_FileChooser_Dev* GetPPB_FileChooser_Thunk();
-const PPB_FileIO_Dev* GetPPB_FileIO_Thunk();
-const PPB_FileIOTrusted_Dev* GetPPB_FileIOTrusted_Thunk();
-const PPB_FileRef_Dev* GetPPB_FileRef_Thunk();
-const PPB_FileSystem_Dev* GetPPB_FileSystem_Thunk();
+const PPB_FileIO* GetPPB_FileIO_Thunk();
+const PPB_FileIOTrusted* GetPPB_FileIOTrusted_Thunk();
+const PPB_FileRef* GetPPB_FileRef_Thunk();
+const PPB_FileSystem* GetPPB_FileSystem_Thunk();
 const PPB_Find_Dev* GetPPB_Find_Thunk();
 const PPB_Flash_Menu* GetPPB_Flash_Menu_Thunk();
 const PPB_Flash_NetConnector* GetPPB_Flash_NetConnector_Thunk();