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

trunk/src/content/renderer/pepper/pepper_file_chooser_host_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/files/file_path.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/file_chooser_params.h"
 #include "content/public/test/render_view_test.h"
 #include "content/renderer/pepper/mock_renderer_ppapi_host.h"
 #include "content/renderer/pepper/pepper_file_chooser_host.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/test/test_content_client.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/host/host_message_context.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/proxy/resource_message_test_sink.h"
-#include "ppapi/shared_impl/file_ref_create_info.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
+#include "ppapi/shared_impl/ppb_file_ref_shared.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 #include "ppapi/shared_impl/test_globals.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 namespace content {
 
 namespace {
 
 class PepperFileChooserHostTest : public RenderViewTest {
@@ skipping 82 matching lines @@
   IPC::Message reply_msg;
   ASSERT_TRUE(host.sink().GetFirstResourceReplyMatching(
       PpapiPluginMsg_FileChooser_ShowReply::ID, &reply_params, &reply_msg));
 
   // Basic validation of reply.
   EXPECT_EQ(call_params.sequence(), reply_params.sequence());
   EXPECT_EQ(PP_OK, reply_params.result());
   PpapiPluginMsg_FileChooser_ShowReply::Schema::Param reply_msg_param;
   ASSERT_TRUE(PpapiPluginMsg_FileChooser_ShowReply::Read(&reply_msg,
                                                          &reply_msg_param));
-  const std::vector<ppapi::FileRefCreateInfo>& chooser_results =
+  const std::vector<ppapi::PPB_FileRef_CreateInfo>& chooser_results =
       reply_msg_param.a;
   ASSERT_EQ(1u, chooser_results.size());
+  // Note path is empty because this is an external filesystem.
+  EXPECT_EQ(std::string(), chooser_results[0].path);
   EXPECT_EQ(FilePathToUTF8(selected_info.display_name),
-            chooser_results[0].display_name);
+            chooser_results[0].name);
 }
 
 TEST_F(PepperFileChooserHostTest, NoUserGesture) {
   PP_Resource pp_resource = 123;
 
   MockRendererPpapiHost host(view_, pp_instance());
   PepperFileChooserHost chooser(&host, pp_instance(), pp_resource);
 
   // Say there's no user gesture.
   host.set_has_user_gesture(false);
 
   std::vector<std::string> accept;
   accept.push_back("text/plain");
   PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept);
 
   ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0);
   ppapi::host::HostMessageContext context(call_params);
   int32 result = chooser.OnResourceMessageReceived(show_msg, &context);
   EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result);
 }
 
 }  // namespace content