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

ppapi/proxy/ppb_file_ref_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_ref_proxy.h"
 
-#include "ppapi/c/dev/ppb_file_ref_dev.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/c/private/ppb_proxy_private.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/ppb_file_ref_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
@@ skipping 17 matching lines @@
 
 class FileRef : public PluginResource, public PPB_FileRef_API {
  public:
   explicit FileRef(const PPBFileRef_CreateInfo& info);
   virtual ~FileRef();
 
   // ResourceObjectBase overrides.
   virtual PPB_FileRef_API* AsPPB_FileRef_API() OVERRIDE;
 
   // PPB_FileRef_API implementation.
-  virtual PP_FileSystemType_Dev GetFileSystemType() const OVERRIDE;
+  virtual PP_FileSystemType GetFileSystemType() const OVERRIDE;
   virtual PP_Var GetName() const OVERRIDE;
   virtual PP_Var GetPath() const OVERRIDE;
   virtual PP_Resource GetParent() OVERRIDE;
   virtual int32_t MakeDirectory(PP_Bool make_ancestors,
                                 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 Delete(PP_CompletionCallback callback) OVERRIDE;
   virtual int32_t Rename(PP_Resource new_file_ref,
                          PP_CompletionCallback callback) OVERRIDE;
 
  private:
-  PP_FileSystemType_Dev file_system_type_;
+  PP_FileSystemType file_system_type_;
   PP_Var path_;
   PP_Var name_;
 
   DISALLOW_COPY_AND_ASSIGN(FileRef);
 };
 
 FileRef::FileRef(const PPBFileRef_CreateInfo& info)
     : PluginResource(info.resource) {
   Dispatcher* dispatcher = PluginDispatcher::GetForInstance(instance());
 
-  file_system_type_ = static_cast<PP_FileSystemType_Dev>(info.file_system_type);
+  file_system_type_ = static_cast<PP_FileSystemType>(info.file_system_type);
 
   name_ = ReceiveSerializedVarReturnValue(info.name).Return(dispatcher);
   path_ = ReceiveSerializedVarReturnValue(info.path).Return(dispatcher);
 }
 
 FileRef::~FileRef() {
   PluginVarTracker::GetInstance()->Release(path_);
   PluginVarTracker::GetInstance()->Release(name_);
 }
 
 PPB_FileRef_API* FileRef::AsPPB_FileRef_API() {
   return this;
 }
 
-PP_FileSystemType_Dev FileRef::GetFileSystemType() const {
+PP_FileSystemType FileRef::GetFileSystemType() const {
   return file_system_type_;
 }
 
 PP_Var FileRef::GetName() const {
   PluginVarTracker::GetInstance()->AddRef(name_);
   return name_;
 }
 
 PP_Var FileRef::GetPath() const {
   PluginVarTracker::GetInstance()->AddRef(path_);
@@ skipping 51 matching lines @@
                                      const void* target_interface)
     : InterfaceProxy(dispatcher, target_interface) {
 }
 
 PPB_FileRef_Proxy::~PPB_FileRef_Proxy() {
 }
 
 const InterfaceProxy::Info* PPB_FileRef_Proxy::GetInfo() {
   static const Info info = {
     ::ppapi::thunk::GetPPB_FileRef_Thunk(),
-    PPB_FILEREF_DEV_INTERFACE,
+    PPB_FILEREF_INTERFACE,
     INTERFACE_ID_PPB_FILE_REF,
     false,
     &CreateFileRefProxy,
   };
   return &info;
 }
 
 // static
 PP_Resource PPB_FileRef_Proxy::CreateProxyResource(PP_Resource file_system,
                                                    const char* path) {
@@ skipping 125 matching lines @@
     return;
   PP_CompletionCallback callback = ReceiveCallback(serialized_callback);
   int32_t result = enter.object()->Rename(new_file_ref.host_resource(),
                                           callback);
   if (result != PP_OK_COMPLETIONPENDING)
     PP_RunCompletionCallback(&callback, result);
 }
 
 }  // namespace proxy
 }  // namespace pp