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

trunk/src/ppapi/proxy/file_chooser_resource_unittest.cc

Index: trunk/src/ppapi/proxy/file_chooser_resource_unittest.cc
===================================================================
--- trunk/src/ppapi/proxy/file_chooser_resource_unittest.cc	(revision 217031)
+++ trunk/src/ppapi/proxy/file_chooser_resource_unittest.cc	(working copy)
@@ -5,7 +5,6 @@
 #include "base/message_loop/message_loop.h"
 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/c/ppb_file_ref.h"
 #include "ppapi/proxy/file_chooser_resource.h"
 #include "ppapi/proxy/locking_resource_releaser.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -92,13 +91,13 @@
   reply_params.set_result(PP_OK);
 
   // Synthesize a response with one file ref in it. Note that it must have a
-  // pending_host_resource_id set. Since there isn't actually a host, this can
-  // be whatever we want.
-  std::vector<FileRefCreateInfo> create_info_array;
-  FileRefCreateInfo create_info;
-  create_info.file_system_type = PP_FILESYSTEMTYPE_EXTERNAL;
-  create_info.display_name = "bar";
-  create_info.pending_host_resource_id = 12;
+  // host resource value set or deserialization will fail. Since there isn't
+  // actually a host, this can be whatever we want.
+  std::vector<PPB_FileRef_CreateInfo> create_info_array;
+  PPB_FileRef_CreateInfo create_info;
+  create_info.resource.SetHostResource(pp_instance(), 123);
+  create_info.path = "foo/bar";
+  create_info.name = "baz";
   create_info_array.push_back(create_info);
   ASSERT_TRUE(plugin_dispatcher()->OnMessageReceived(
       PpapiPluginMsg_ResourceReply(reply_params,
@@ -116,8 +115,9 @@
   {
     ProxyAutoLock lock;
     ScopedPPVar release_name_var(ScopedPPVar::PassRef(), name_var);
-    EXPECT_VAR_IS_STRING("bar", name_var);
+    EXPECT_VAR_IS_STRING(create_info.name, name_var);
   }
+  // Path should be undefined since it's external filesystem.
   PP_Var path_var(file_ref_iface->GetPath(dest[0]));
   {
     ProxyAutoLock lock;