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

ppapi/proxy/ppb_file_system_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_file_system_proxy.h"
 
 #include "base/message_loop.h"
 #include "base/task.h"
-#include "ppapi/c/dev/ppb_file_system_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_system.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/host_dispatcher.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/serialized_var.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_system_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
@@ skipping 12 matching lines @@
   return new PPB_FileSystem_Proxy(dispatcher, target_interface);
 }
 
 }  // namespace
 
 // This object maintains most of the state of the ref in the plugin for fast
 // querying. It's all set in the constructor from the "create info" sent from
 // the host.
 class FileSystem : public PluginResource, public PPB_FileSystem_API {
  public:
-  FileSystem(const HostResource& host_resource, PP_FileSystemType_Dev type);
+  FileSystem(const HostResource& host_resource, PP_FileSystemType type);
   virtual ~FileSystem();
 
   // ResourceObjectBase override.
   virtual PPB_FileSystem_API* AsPPB_FileSystem_API() OVERRIDE;
 
   // 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;
 
   // Called when the host has responded to our open request.
   void OpenComplete(int32_t result);
 
  private:
-  PP_FileSystemType_Dev type_;
+  PP_FileSystemType type_;
   bool called_open_;
   PP_CompletionCallback current_open_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystem);
 };
 
 FileSystem::FileSystem(const HostResource& host_resource,
-                       PP_FileSystemType_Dev type)
+                       PP_FileSystemType type)
     : PluginResource(host_resource),
       type_(type),
       called_open_(false),
       current_open_callback_(PP_MakeCompletionCallback(NULL, NULL)) {
 }
 
 // TODO(brettw) this logic is duplicated with some other resource objects
 // like FileChooser. It would be nice to look at all of the different resources
 // that need callback tracking and design something that they can all re-use.
 FileSystem::~FileSystem() {
@@ skipping 18 matching lines @@
   if (called_open_)
     return PP_ERROR_FAILED;
 
   current_open_callback_ = callback;
   called_open_ = true;
   GetDispatcher()->Send(new PpapiHostMsg_PPBFileSystem_Open(
       INTERFACE_ID_PPB_FILE_SYSTEM, host_resource(), expected_size));
   return PP_OK_COMPLETIONPENDING;
 }
 
-PP_FileSystemType_Dev FileSystem::GetType() {
+PP_FileSystemType FileSystem::GetType() {
   return type_;
 }
 
 void FileSystem::OpenComplete(int32_t result) {
   PP_RunAndClearCompletionCallback(&current_open_callback_, result);
 }
 
 PPB_FileSystem_Proxy::PPB_FileSystem_Proxy(Dispatcher* dispatcher,
                                            const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface),
       callback_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
 
 PPB_FileSystem_Proxy::~PPB_FileSystem_Proxy() {
 }
 
 const InterfaceProxy::Info* PPB_FileSystem_Proxy::GetInfo() {
   static const Info info = {
     ::ppapi::thunk::GetPPB_FileSystem_Thunk(),
-    PPB_FILESYSTEM_DEV_INTERFACE,
+    PPB_FILESYSTEM_INTERFACE,
     INTERFACE_ID_PPB_FILE_SYSTEM,
     false,
     &CreateFileSystemProxy,
   };
   return &info;
 }
 
 // static
 PP_Resource PPB_FileSystem_Proxy::CreateProxyResource(
     PP_Instance instance,
-    PP_FileSystemType_Dev type) {
+    PP_FileSystemType type) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return PP_ERROR_BADARGUMENT;
 
   HostResource result;
   dispatcher->Send(new PpapiHostMsg_PPBFileSystem_Create(
       INTERFACE_ID_PPB_FILE_SYSTEM, instance, type, &result));
   if (result.is_null())
     return 0;
 
@@ skipping 12 matching lines @@
   return handled;
 }
 
 void PPB_FileSystem_Proxy::OnMsgCreate(PP_Instance instance,
                                        int type,
                                        HostResource* result) {
   EnterFunctionNoLock<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
     return;
   PP_Resource resource = enter.functions()->CreateFileSystem(
-      instance, static_cast<PP_FileSystemType_Dev>(type));
+      instance, static_cast<PP_FileSystemType>(type));
   if (!resource)
     return;  // CreateInfo default constructor initializes to 0.
   result->SetHostResource(instance, resource);
 }
 
 void PPB_FileSystem_Proxy::OnMsgOpen(const HostResource& host_resource,
                                      int64_t expected_size) {
   EnterHostFromHostResource<PPB_FileSystem_API> enter(host_resource);
   if (enter.failed())
     return;
@@ skipping 16 matching lines @@
 
 void PPB_FileSystem_Proxy::OpenCompleteInHost(
     int32_t result,
     const HostResource& host_resource) {
   dispatcher()->Send(new PpapiMsg_PPBFileSystem_OpenComplete(
       INTERFACE_ID_PPB_FILE_SYSTEM, host_resource, result));
 }
 
 }  // namespace proxy
 }  // namespace pp