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

trunk/src/ppapi/proxy/file_chooser_resource_unittest.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 "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"
 #include "ppapi/proxy/ppapi_proxy_test.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/scoped_pp_var.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
@@ skipping 66 matching lines @@
   ResourceMessageCallParams params;
   IPC::Message msg;
   ASSERT_TRUE(sink().GetFirstResourceCallMatching(
       PpapiHostMsg_FileChooser_Show::ID, &params, &msg));
 
   ResourceMessageReplyParams reply_params(params.pp_resource(),
                                           params.sequence());
   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,
           PpapiPluginMsg_FileChooser_ShowReply(create_info_array))));
 
   // Should have populated our vector.
   ASSERT_EQ(1u, dest.size());
   LockingResourceReleaser dest_deletor(dest[0]);  // Ensure it's cleaned up.
 
   const PPB_FileRef_1_0* file_ref_iface = thunk::GetPPB_FileRef_1_0_Thunk();
   EXPECT_EQ(PP_FILESYSTEMTYPE_EXTERNAL,
             file_ref_iface->GetFileSystemType(dest[0]));
 
   PP_Var name_var(file_ref_iface->GetName(dest[0]));
   {
     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;
     ScopedPPVar release_path_var(ScopedPPVar::PassRef(), path_var);
     EXPECT_EQ(PP_VARTYPE_UNDEFINED, path_var.type);
   }
 }
 
 TEST_F(FileChooserResourceTest, PopulateAcceptTypes) {
   EXPECT_TRUE(CheckParseAcceptType(std::string(), NULL, NULL));
   EXPECT_TRUE(CheckParseAcceptType("/", NULL, NULL));
   EXPECT_TRUE(CheckParseAcceptType(".", NULL, NULL));
   EXPECT_TRUE(CheckParseAcceptType(",, , ", NULL, NULL));
 
   EXPECT_TRUE(CheckParseAcceptType("app/txt", "app/txt", NULL));
   EXPECT_TRUE(CheckParseAcceptType("app/txt,app/pdf", "app/txt", "app/pdf"));
   EXPECT_TRUE(CheckParseAcceptType(" app/txt , app/pdf ",
                                    "app/txt", "app/pdf"));
 
   // No dot or slash ones should be skipped.
   EXPECT_TRUE(CheckParseAcceptType("foo", NULL, NULL));
   EXPECT_TRUE(CheckParseAcceptType("foo,.txt", ".txt", NULL));
 }
 
 }  // namespace proxy
 }  // namespace ppapi