Revert 219911 "Pepper: Move FileRef to the "new" resource proxy."

trunk/src/ppapi/proxy/file_chooser_resource.cc

 // Copyright (c) 2012 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/file_chooser_resource.h"
 
 #include "base/bind.h"
 #include "base/strings/string_split.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/dispatch_reply_message.h"
-#include "ppapi/proxy/file_ref_resource.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_file_ref_proxy.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
 FileChooserResource::FileChooserResource(Connection connection,
                                          PP_Instance instance,
                                          PP_FileChooserMode_Dev mode,
                                          const std::string& accept_types)
     : PluginResource(connection, instance),
@@ skipping 69 matching lines @@
       continue;
     if (type.find_first_of('/') == std::string::npos && type[0] != '.')
       continue;
     StringToLowerASCII(&type);
     output->push_back(type);
   }
 }
 
 void FileChooserResource::OnPluginMsgShowReply(
     const ResourceMessageReplyParams& params,
-    const std::vector<FileRefCreateInfo>& chosen_files) {
+    const std::vector<PPB_FileRef_CreateInfo>& chosen_files) {
   if (output_.is_valid()) {
     // Using v0.6 of the API with the output array.
     std::vector<PP_Resource> files;
-    for (size_t i = 0; i < chosen_files.size(); i++) {
-      files.push_back(FileRefResource::CreateFileRef(
-          connection(),
-          pp_instance(),
-          chosen_files[i]));
-    }
+    for (size_t i = 0; i < chosen_files.size(); i++)
+      files.push_back(PPB_FileRef_Proxy::DeserializeFileRef(chosen_files[i]));
     output_.StoreResourceVector(files);
   } else {
     // Convert each of the passed in file infos to resources. These will be
     // owned by the FileChooser object until they're passed to the plugin.
     DCHECK(file_queue_.empty());
     for (size_t i = 0; i < chosen_files.size(); i++) {
-      file_queue_.push(FileRefResource::CreateFileRef(
-          connection(),
-          pp_instance(),
+      file_queue_.push(PPB_FileRef_Proxy::DeserializeFileRef(
           chosen_files[i]));
     }
   }
 
   // Notify the plugin of the new data.
   callback_->Run(params.result());
   // DANGER: May delete |this|!
 }
 
 int32_t FileChooserResource::ShowInternal(
@@ skipping 14 matching lines @@
         mode_ == PP_FILECHOOSERMODE_OPENMULTIPLE,
         sugg_str ? sugg_str->value() : std::string(),
         accept_types_);
   Call<PpapiPluginMsg_FileChooser_ShowReply>(RENDERER, msg,
       base::Bind(&FileChooserResource::OnPluginMsgShowReply, this));
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace proxy
 }  // namespace ppapi