Fix PP_FileOpenFlags_Dev handling:

webkit/plugins/ppapi/ppb_flash_file_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_flash_file_impl.h"
 
 #include <string.h>
 
 #include <string>
 
 #include "ppapi/c/dev/pp_file_info_dev.h"
 #include "ppapi/c/dev/ppb_file_io_dev.h"
 #include "ppapi/c/private/ppb_flash_file.h"
 #include "webkit/plugins/ppapi/common.h"
-#include "webkit/plugins/ppapi/error_util.h"
 #include "webkit/plugins/ppapi/file_path.h"
+#include "webkit/plugins/ppapi/file_type_conversions.h"
 #include "webkit/plugins/ppapi/plugin_delegate.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"
 
 #if defined(OS_WIN)
 #include "base/utf_string_conversions.h"
 #endif
 
 namespace webkit {
 namespace ppapi {
 
 namespace {
 
-// TODO(viettrungluu): The code below is duplicated in ppb_file_io_impl.cc
-// (where it's incorrect to boot).
-// Returns |true| if okay.
-bool ConvertFromPPFileOpenFlags(int32_t pp_open_flags, int* flags_out) {
-  int flags = 0;
-  if (pp_open_flags & PP_FILEOPENFLAG_READ)
-    flags |= base::PLATFORM_FILE_READ;
-  if (pp_open_flags & PP_FILEOPENFLAG_WRITE) {
-    flags |= base::PLATFORM_FILE_WRITE;
-    flags |= base::PLATFORM_FILE_WRITE_ATTRIBUTES;
-  }
-  if (pp_open_flags & PP_FILEOPENFLAG_TRUNCATE) {
-    if (!(pp_open_flags & PP_FILEOPENFLAG_WRITE))
-      return false;
-    flags |= base::PLATFORM_FILE_TRUNCATE;
-  }
-  if (pp_open_flags & PP_FILEOPENFLAG_CREATE) {
-    if (pp_open_flags & PP_FILEOPENFLAG_EXCLUSIVE)
-      flags |= base::PLATFORM_FILE_CREATE;
-    else
-      flags |= base::PLATFORM_FILE_OPEN_ALWAYS;
-  } else {
-    flags |= base::PLATFORM_FILE_OPEN;
-  }
-  *flags_out = flags;
-  return true;
-}
-
 void FreeDirContents(PP_Instance instance, PP_DirContents_Dev* contents) {
   DCHECK(contents);
   for (int32_t i = 0; i < contents->count; ++i) {
     delete [] contents->entries[i].name;
   }
   delete [] contents->entries;
   delete contents;
 }
 
 }  // namespace
 
 // PPB_Flash_File_ModuleLocal_Impl ---------------------------------------------
 
 namespace {
 
 bool CreateThreadAdapterForInstance(PP_Instance instance) {
   return false;  // No multithreaded access allowed.
 }
 
 void ClearThreadAdapterForInstance(PP_Instance instance) {
 }
 
 int32_t OpenModuleLocalFile(PP_Instance pp_instance,
                             const char* path,
                             int32_t mode,
                             PP_FileHandle* file) {
   int flags = 0;
-  if (!path || !ConvertFromPPFileOpenFlags(mode, &flags) || !file)
+  if (!path || !PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
     return PP_ERROR_BADARGUMENT;
 
   PluginInstance* instance = ResourceTracker::Get()->GetInstance(pp_instance);
   if (!instance)
     return PP_ERROR_FAILED;
 
   base::PlatformFile base_file;
   base::PlatformFileError result = instance->delegate()->OpenFile(
       PepperFilePath::MakeModuleLocal(instance->module(), path),
       flags,
@@ skipping 134 matching lines @@
 }
 
 // PPB_Flash_File_FileRef_Impl -------------------------------------------------
 
 namespace {
 
 int32_t OpenFileRefFile(PP_Resource file_ref_id,
                         int32_t mode,
                         PP_FileHandle* file) {
   int flags = 0;
-  if (!ConvertFromPPFileOpenFlags(mode, &flags) || !file)
+  if (!PepperFileOpenFlagsToPlatformFileFlags(mode, &flags) || !file)
     return PP_ERROR_BADARGUMENT;
 
   scoped_refptr<PPB_FileRef_Impl> file_ref(
       Resource::GetAs<PPB_FileRef_Impl>(file_ref_id));
   if (!file_ref)
     return PP_ERROR_BADRESOURCE;
 
   PluginInstance* instance = file_ref->instance();
   if (!instance)
     return PP_ERROR_FAILED;
@@ skipping 43 matching lines @@
 
 }  // namespace
 
 // static
 const PPB_Flash_File_FileRef* PPB_Flash_File_FileRef_Impl::GetInterface() {
   return &ppb_flash_file_fileref;
 }
 
 }  // namespace ppapi
 }  // namespace webkit