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

webkit/plugins/ppapi/ppb_file_io_impl.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 "webkit/plugins/ppapi/ppb_file_io_impl.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/message_loop_proxy.h"
 #include "base/platform_file.h"
 #include "base/logging.h"
 #include "base/time.h"
-#include "ppapi/c/dev/ppb_file_io_dev.h"
-#include "ppapi/c/dev/ppb_file_io_trusted_dev.h"
+#include "ppapi/c/ppb_file_io.h"
+#include "ppapi/c/trusted/ppb_file_io_trusted.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_file_ref_api.h"
 #include "webkit/plugins/ppapi/common.h"
 #include "webkit/plugins/ppapi/file_type_conversions.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/resource_tracker.h"
@@ skipping 56 matching lines @@
         return PP_ERROR_FAILED;
       break;
     default:
       return PP_ERROR_FAILED;
   }
 
   RegisterCallback(callback);
   return PP_OK_COMPLETIONPENDING;
 }
 
-int32_t PPB_FileIO_Impl::Query(PP_FileInfo_Dev* info,
+int32_t PPB_FileIO_Impl::Query(PP_FileInfo* info,
                                PP_CompletionCallback callback) {
   int32_t rv = CommonCallValidation(true, callback);
   if (rv != PP_OK)
     return rv;
 
   if (!info)
     return PP_ERROR_BADARGUMENT;
 
   DCHECK(!info_);  // If |info_|, a callback should be pending (caught above).
   info_ = info;
@@ skipping 198 matching lines @@
 void PPB_FileIO_Impl::ReadCallback(base::PlatformFileError error_code,
                                    const char* data, int bytes_read) {
   DCHECK(data);
   DCHECK(read_buffer_);
 
   int rv;
   if (error_code == base::PLATFORM_FILE_OK) {
     rv = bytes_read;
     if (file_ != base::kInvalidPlatformFileValue)
       memcpy(read_buffer_, data, bytes_read);
-  } else
+  } else {
     rv = PlatformFileErrorToPepperError(error_code);
+  }
 
   read_buffer_ = NULL;
   RunPendingCallback(rv);
 }
 
 void PPB_FileIO_Impl::WriteCallback(base::PlatformFileError error_code,
                                     int bytes_written) {
   if (error_code != base::PLATFORM_FILE_OK)
     RunPendingCallback(PlatformFileErrorToPepperError(error_code));
   else
     RunPendingCallback(bytes_written);
 }
 
 }  // namespace ppapi
 }  // namespace webkit