| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
| 7 #include "content/common/view_messages.h" | 7 #include "content/common/view_messages.h" |
| 8 #include "content/public/common/file_chooser_params.h" | 8 #include "content/public/common/file_chooser_params.h" |
| 9 #include "content/public/test/render_view_test.h" | 9 #include "content/public/test/render_view_test.h" |
| 10 #include "content/renderer/pepper/mock_renderer_ppapi_host.h" | 10 #include "content/renderer/pepper/mock_renderer_ppapi_host.h" |
| 11 #include "content/renderer/pepper/pepper_file_chooser_host.h" | 11 #include "content/renderer/pepper/pepper_file_chooser_host.h" |
| 12 #include "content/renderer/render_view_impl.h" | 12 #include "content/renderer/render_view_impl.h" |
| 13 #include "content/test/test_content_client.h" | 13 #include "content/test/test_content_client.h" |
| 14 #include "ppapi/c/pp_errors.h" | 14 #include "ppapi/c/pp_errors.h" |
| 15 #include "ppapi/host/host_message_context.h" | 15 #include "ppapi/host/host_message_context.h" |
| 16 #include "ppapi/host/ppapi_host.h" | 16 #include "ppapi/host/ppapi_host.h" |
| 17 #include "ppapi/proxy/ppapi_messages.h" | 17 #include "ppapi/proxy/ppapi_messages.h" |
| 18 #include "ppapi/proxy/resource_message_params.h" | 18 #include "ppapi/proxy/resource_message_params.h" |
| 19 #include "ppapi/proxy/resource_message_test_sink.h" | 19 #include "ppapi/proxy/resource_message_test_sink.h" |
| 20 #include "ppapi/shared_impl/ppapi_permissions.h" | 20 #include "ppapi/shared_impl/ppapi_permissions.h" |
| 21 #include "ppapi/shared_impl/ppb_file_ref_shared.h" | |
| 22 #include "ppapi/shared_impl/resource_tracker.h" | 21 #include "ppapi/shared_impl/resource_tracker.h" |
| 23 #include "ppapi/shared_impl/test_globals.h" | 22 #include "ppapi/shared_impl/test_globals.h" |
| 24 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 25 #include "ui/shell_dialogs/selected_file_info.h" | 24 #include "ui/shell_dialogs/selected_file_info.h" |
| 26 | 25 |
| 27 namespace content { | 26 namespace content { |
| 28 | 27 |
| 29 namespace { | 28 namespace { |
| 30 | 29 |
| 31 class PepperFileChooserHostTest : public RenderViewTest { | 30 class PepperFileChooserHostTest : public RenderViewTest { |
| (...skipping 26 matching lines...) Expand all Loading... |
| 58 std::string FilePathToUTF8(const base::FilePath::StringType& path) { | 57 std::string FilePathToUTF8(const base::FilePath::StringType& path) { |
| 59 #if defined(OS_WIN) | 58 #if defined(OS_WIN) |
| 60 return UTF16ToUTF8(path); | 59 return UTF16ToUTF8(path); |
| 61 #else | 60 #else |
| 62 return path; | 61 return path; |
| 63 #endif | 62 #endif |
| 64 } | 63 } |
| 65 | 64 |
| 66 } // namespace | 65 } // namespace |
| 67 | 66 |
| 67 /* |
| 68 // TODO(teravest): Rewrite this test now that it requires renderer-browser |
| 69 // communication. |
| 68 TEST_F(PepperFileChooserHostTest, Show) { | 70 TEST_F(PepperFileChooserHostTest, Show) { |
| 69 PP_Resource pp_resource = 123; | 71 PP_Resource pp_resource = 123; |
| 70 | 72 |
| 71 MockRendererPpapiHost host(view_, pp_instance()); | 73 MockRendererPpapiHost host(view_, pp_instance()); |
| 72 PepperFileChooserHost chooser(&host, pp_instance(), pp_resource); | 74 PepperFileChooserHost chooser(&host, pp_instance(), pp_resource); |
| 73 | 75 |
| 74 // Say there's a user gesture. | 76 // Say there's a user gesture. |
| 75 host.set_has_user_gesture(true); | 77 host.set_has_user_gesture(true); |
| 76 | 78 |
| 77 std::vector<std::string> accept; | 79 std::vector<std::string> accept; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 IPC::Message reply_msg; | 116 IPC::Message reply_msg; |
| 115 ASSERT_TRUE(host.sink().GetFirstResourceReplyMatching( | 117 ASSERT_TRUE(host.sink().GetFirstResourceReplyMatching( |
| 116 PpapiPluginMsg_FileChooser_ShowReply::ID, &reply_params, &reply_msg)); | 118 PpapiPluginMsg_FileChooser_ShowReply::ID, &reply_params, &reply_msg)); |
| 117 | 119 |
| 118 // Basic validation of reply. | 120 // Basic validation of reply. |
| 119 EXPECT_EQ(call_params.sequence(), reply_params.sequence()); | 121 EXPECT_EQ(call_params.sequence(), reply_params.sequence()); |
| 120 EXPECT_EQ(PP_OK, reply_params.result()); | 122 EXPECT_EQ(PP_OK, reply_params.result()); |
| 121 PpapiPluginMsg_FileChooser_ShowReply::Schema::Param reply_msg_param; | 123 PpapiPluginMsg_FileChooser_ShowReply::Schema::Param reply_msg_param; |
| 122 ASSERT_TRUE(PpapiPluginMsg_FileChooser_ShowReply::Read(&reply_msg, | 124 ASSERT_TRUE(PpapiPluginMsg_FileChooser_ShowReply::Read(&reply_msg, |
| 123 &reply_msg_param)); | 125 &reply_msg_param)); |
| 124 const std::vector<ppapi::PPB_FileRef_CreateInfo>& chooser_results = | 126 const std::vector<ppapi::PPB_FileRefCreateInfo>& chooser_results = |
| 125 reply_msg_param.a; | 127 reply_msg_param.a; |
| 126 ASSERT_EQ(1u, chooser_results.size()); | 128 ASSERT_EQ(1u, chooser_results.size()); |
| 127 // Note path is empty because this is an external filesystem. | 129 // Note path is empty because this is an external filesystem. |
| 128 EXPECT_EQ(std::string(), chooser_results[0].path); | 130 EXPECT_EQ(std::string(), chooser_results[0].path); |
| 129 EXPECT_EQ(FilePathToUTF8(selected_info.display_name), | 131 EXPECT_EQ(FilePathToUTF8(selected_info.display_name), |
| 130 chooser_results[0].name); | 132 chooser_results[0].name); |
| 131 } | 133 } |
| 134 */ |
| 132 | 135 |
| 133 TEST_F(PepperFileChooserHostTest, NoUserGesture) { | 136 TEST_F(PepperFileChooserHostTest, NoUserGesture) { |
| 134 PP_Resource pp_resource = 123; | 137 PP_Resource pp_resource = 123; |
| 135 | 138 |
| 136 MockRendererPpapiHost host(view_, pp_instance()); | 139 MockRendererPpapiHost host(view_, pp_instance()); |
| 137 PepperFileChooserHost chooser(&host, pp_instance(), pp_resource); | 140 PepperFileChooserHost chooser(&host, pp_instance(), pp_resource); |
| 138 | 141 |
| 139 // Say there's no user gesture. | 142 // Say there's no user gesture. |
| 140 host.set_has_user_gesture(false); | 143 host.set_has_user_gesture(false); |
| 141 | 144 |
| 142 std::vector<std::string> accept; | 145 std::vector<std::string> accept; |
| 143 accept.push_back("text/plain"); | 146 accept.push_back("text/plain"); |
| 144 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept); | 147 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept); |
| 145 | 148 |
| 146 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); | 149 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); |
| 147 ppapi::host::HostMessageContext context(call_params); | 150 ppapi::host::HostMessageContext context(call_params); |
| 148 int32 result = chooser.OnResourceMessageReceived(show_msg, &context); | 151 int32 result = chooser.OnResourceMessageReceived(show_msg, &context); |
| 149 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); | 152 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); |
| 150 } | 153 } |
| 151 | 154 |
| 152 } // namespace content | 155 } // namespace content |
| OLD | NEW |