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" | 21 #include "ppapi/shared_impl/ppb_file_ref_shared.h" |
| 22 #include "ppapi/shared_impl/proxy_lock.h" |
22 #include "ppapi/shared_impl/resource_tracker.h" | 23 #include "ppapi/shared_impl/resource_tracker.h" |
23 #include "ppapi/shared_impl/test_globals.h" | 24 #include "ppapi/shared_impl/test_globals.h" |
24 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
25 #include "ui/shell_dialogs/selected_file_info.h" | 26 #include "ui/shell_dialogs/selected_file_info.h" |
26 | 27 |
27 namespace content { | 28 namespace content { |
28 | 29 |
29 namespace { | 30 namespace { |
30 | 31 |
31 class PepperFileChooserHostTest : public RenderViewTest { | 32 class PepperFileChooserHostTest : public RenderViewTest { |
32 public: | 33 public: |
33 PepperFileChooserHostTest() | 34 PepperFileChooserHostTest() |
34 : pp_instance_(123456) {} | 35 : pp_instance_(123456) {} |
35 | 36 |
36 virtual void SetUp() { | 37 virtual void SetUp() { |
37 SetContentClient(&client_); | 38 SetContentClient(&client_); |
38 RenderViewTest::SetUp(); | 39 RenderViewTest::SetUp(); |
| 40 ppapi::ProxyLock::DisableLockingOnThreadForTest(); |
39 | 41 |
40 globals_.GetResourceTracker()->DidCreateInstance(pp_instance_); | 42 globals_.GetResourceTracker()->DidCreateInstance(pp_instance_); |
41 } | 43 } |
42 virtual void TearDown() { | 44 virtual void TearDown() { |
43 globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_); | 45 globals_.GetResourceTracker()->DidDeleteInstance(pp_instance_); |
44 | 46 |
45 RenderViewTest::TearDown(); | 47 RenderViewTest::TearDown(); |
46 } | 48 } |
47 | 49 |
48 PP_Instance pp_instance() const { return pp_instance_; } | 50 PP_Instance pp_instance() const { return pp_instance_; } |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
143 accept.push_back("text/plain"); | 145 accept.push_back("text/plain"); |
144 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept); | 146 PpapiHostMsg_FileChooser_Show show_msg(false, false, std::string(), accept); |
145 | 147 |
146 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); | 148 ppapi::proxy::ResourceMessageCallParams call_params(pp_resource, 0); |
147 ppapi::host::HostMessageContext context(call_params); | 149 ppapi::host::HostMessageContext context(call_params); |
148 int32 result = chooser.OnResourceMessageReceived(show_msg, &context); | 150 int32 result = chooser.OnResourceMessageReceived(show_msg, &context); |
149 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); | 151 EXPECT_EQ(PP_ERROR_NO_USER_GESTURE, result); |
150 } | 152 } |
151 | 153 |
152 } // namespace content | 154 } // namespace content |
OLD | NEW |