PPB_Flash cleanup part 2: move all the file stuff to ppb_flash_file.*.

ppb_flash_file.* is intended to contain multiple (very similar) interfaces, of
which the ModuleLocal stuff is one.

BUG=none
TEST="everything" still works

Review URL: http://codereview.chromium.org/6579026

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

3 files changed, 91 insertions, 74 deletions

diff --git a/ppapi/c/private/ppb_flash.h b/ppapi/c/private/ppb_flash.h
index c602278..92ae56f 100644
--- a/ppapi/c/private/ppb_flash.h
+++ b/ppapi/c/private/ppb_flash.h
@@ -5,10 +5,6 @@
 #ifndef PPAPI_C_PRIVATE_PPB_FLASH_H_
 #define PPAPI_C_PRIVATE_PPB_FLASH_H_
 
-#ifdef _WIN32
-#include <windows.h>
-#endif
-
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_point.h"
@@ -16,29 +12,7 @@
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 
-#define PPB_FLASH_INTERFACE "PPB_Flash;6"
-
-#ifdef _WIN32
-typedef HANDLE PP_FileHandle;
-static const PP_FileHandle PP_kInvalidFileHandle = NULL;
-#else
-typedef int PP_FileHandle;
-static const PP_FileHandle PP_kInvalidFileHandle = -1;
-#endif
-
-struct PP_CompletionCallback;
-struct PP_FontDescription_Dev;
-struct PP_FileInfo_Dev;
-
-struct PP_DirEntry_Dev {
-  const char* name;
-  PP_Bool is_dir;
-};
-
-struct PP_DirContents_Dev {
-  int32_t count;
-  struct PP_DirEntry_Dev* entries;
-};
+#define PPB_FLASH_INTERFACE "PPB_Flash;7"
 
 struct PPB_Flash {
   // Sets or clears the rendering hint that the given plugin instance is always
@@ -61,52 +35,6 @@ struct PPB_Flash {
   // be a string in PAC format, or an undefined var on error.
   struct PP_Var (*GetProxyForURL)(PP_Instance instance, const char* url);
 
-  // Opens a module-local file, returning a file descriptor (posix) or a HANDLE
-  // (win32) into file. Module-local file paths (here and below) are
-  // '/'-separated UTF-8 strings, relative to a module-specific root. The return
-  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-  // of failure.
-  int32_t (*OpenModuleLocalFile)(PP_Instance instance,
-                                 const char* path,
-                                 int32_t mode,
-                                 PP_FileHandle* file);
-
-  // Renames a module-local file. The return value is the ppapi error, PP_OK if
-  // success, one of the PP_ERROR_* in case of failure.
-  int32_t (*RenameModuleLocalFile)(PP_Instance instance,
-                                   const char* path_from,
-                                   const char* path_to);
-
-  // Deletes a module-local file or directory. If recursive is set and the path
-  // points to a directory, deletes all the contents of the directory. The
-  // return value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in
-  // case of failure.
-  int32_t (*DeleteModuleLocalFileOrDir)(PP_Instance instance,
-                                        const char* path,
-                                        PP_Bool recursive);
-
-  // Creates a module-local directory. The return value is the ppapi error,
-  // PP_OK if success, one of the PP_ERROR_* in case of failure.
-  int32_t (*CreateModuleLocalDir)(PP_Instance instance, const char* path);
-
-  // Queries information about a module-local file. The return value is the
-  // ppapi error, PP_OK if success, one of the PP_ERROR_* in case of failure.
-  int32_t (*QueryModuleLocalFile)(PP_Instance instance,
-                                  const char* path,
-                                  struct PP_FileInfo_Dev* info);
-
-  // Gets the list of files contained in a module-local directory. The return
-  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
-  // of failure. If non-NULL, the returned contents should be freed with
-  // FreeModuleLocalDirContents.
-  int32_t (*GetModuleLocalDirContents)(PP_Instance instance,
-                                       const char* path,
-                                       struct PP_DirContents_Dev** contents);
-
-  // Frees the data allocated by GetModuleLocalDirContents.
-  void (*FreeModuleLocalDirContents)(PP_Instance instance,
-                                     struct PP_DirContents_Dev* contents);
-
   // Navigate to URL. May open a new tab if target is not "_self". Return true
   // if success. This differs from javascript:window.open() in that it bypasses
   // the popup blocker, even when this is not called from an event handler.
diff --git a/ppapi/c/private/ppb_flash_file.h b/ppapi/c/private/ppb_flash_file.h
new file mode 100644
index 0000000..8e1f291
--- /dev/null
+++ b/ppapi/c/private/ppb_flash_file.h
@@ -0,0 +1,89 @@
+// 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 PPAPI_C_PRIVATE_PPB_FLASH_FILE_H_
+#define PPAPI_C_PRIVATE_PPB_FLASH_FILE_H_
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_instance.h"
+
+#ifdef _WIN32
+typedef HANDLE PP_FileHandle;
+static const PP_FileHandle PP_kInvalidFileHandle = NULL;
+#else
+typedef int PP_FileHandle;
+static const PP_FileHandle PP_kInvalidFileHandle = -1;
+#endif
+
+struct PP_CompletionCallback;
+struct PP_FontDescription_Dev;
+struct PP_FileInfo_Dev;
+
+struct PP_DirEntry_Dev {
+  const char* name;
+  PP_Bool is_dir;
+};
+
+struct PP_DirContents_Dev {
+  int32_t count;
+  struct PP_DirEntry_Dev* entries;
+};
+
+// PPB_Flash_File_ModuleLocal --------------------------------------------------
+
+#define PPB_FLASH_FILE_MODULELOCAL_INTERFACE "PPB_Flash_File_ModuleLocal;1"
+
+struct PPB_Flash_File_ModuleLocal {
+  // Opens a module-local file, returning a file descriptor (posix) or a HANDLE
+  // (win32) into file. Module-local file paths (here and below) are
+  // '/'-separated UTF-8 strings, relative to a module-specific root. The return
+  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
+  // of failure.
+  int32_t (*OpenFile)(PP_Instance instance,
+                      const char* path,
+                      int32_t mode,
+                      PP_FileHandle* file);
+
+  // Renames a module-local file. The return value is the ppapi error, PP_OK if
+  // success, one of the PP_ERROR_* in case of failure.
+  int32_t (*RenameFile)(PP_Instance instance,
+                        const char* path_from,
+                        const char* path_to);
+
+  // Deletes a module-local file or directory. If recursive is set and the path
+  // points to a directory, deletes all the contents of the directory. The
+  // return value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in
+  // case of failure.
+  int32_t (*DeleteFileOrDir)(PP_Instance instance,
+                             const char* path,
+                             PP_Bool recursive);
+
+  // Creates a module-local directory. The return value is the ppapi error,
+  // PP_OK if success, one of the PP_ERROR_* in case of failure.
+  int32_t (*CreateDir)(PP_Instance instance, const char* path);
+
+  // Queries information about a module-local file. The return value is the
+  // ppapi error, PP_OK if success, one of the PP_ERROR_* in case of failure.
+  int32_t (*QueryFile)(PP_Instance instance,
+                       const char* path,
+                       struct PP_FileInfo_Dev* info);
+
+  // Gets the list of files contained in a module-local directory. The return
+  // value is the ppapi error, PP_OK if success, one of the PP_ERROR_* in case
+  // of failure. If non-NULL, the returned contents should be freed with
+  // FreeDirContents.
+  int32_t (*GetDirContents)(PP_Instance instance,
+                            const char* path,
+                            struct PP_DirContents_Dev** contents);
+
+  // Frees the data allocated by GetDirContents.
+  void (*FreeDirContents)(PP_Instance instance,
+                          struct PP_DirContents_Dev* contents);
+};
+
+#endif  // PPAPI_C_PRIVATE_PPB_FLASH_FILE_H_
diff --git a/ppapi/c/private/ppb_flash_net_connector.h b/ppapi/c/private/ppb_flash_net_connector.h
index 3ca6411..555e9df 100644
--- a/ppapi/c/private/ppb_flash_net_connector.h
+++ b/ppapi/c/private/ppb_flash_net_connector.h
@@ -8,7 +8,7 @@
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
-#include "ppapi/c/private/ppb_flash.h"  // For |PP_FileHandle|.
+#include "ppapi/c/private/ppb_flash_file.h"  // For |PP_FileHandle|.
 
 #define PPB_FLASH_NETCONNECTOR_INTERFACE "PPB_Flash_NetConnector;1"