OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #if defined(OS_WIN) | 5 #if defined(OS_WIN) |
6 #include <windows.h> | 6 #include <windows.h> |
7 #endif | 7 #endif |
8 | 8 |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "webkit/glue/plugins/test/plugin_client.h" | 10 #include "webkit/glue/plugins/test/plugin_client.h" |
11 #include "webkit/glue/plugins/test/plugin_arguments_test.h" | 11 #include "webkit/glue/plugins/test/plugin_arguments_test.h" |
12 #include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" | 12 #include "webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h" |
13 #include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" | 13 #include "webkit/glue/plugins/test/plugin_get_javascript_url_test.h" |
14 #include "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h" | 14 #include "webkit/glue/plugins/test/plugin_get_javascript_url2_test.h" |
15 #include "webkit/glue/plugins/test/plugin_geturl_test.h" | 15 #include "webkit/glue/plugins/test/plugin_geturl_test.h" |
16 #include "webkit/glue/plugins/test/plugin_javascript_open_popup.h" | 16 #include "webkit/glue/plugins/test/plugin_javascript_open_popup.h" |
17 #include "webkit/glue/plugins/test/plugin_new_fails_test.h" | 17 #include "webkit/glue/plugins/test/plugin_new_fails_test.h" |
18 #include "webkit/glue/plugins/test/plugin_private_test.h" | 18 #include "webkit/glue/plugins/test/plugin_private_test.h" |
19 #include "webkit/glue/plugins/test/plugin_schedule_timer_test.h" | 19 #include "webkit/glue/plugins/test/plugin_schedule_timer_test.h" |
| 20 #include "webkit/glue/plugins/test/plugin_thread_async_call_test.h" |
20 #include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h" | 21 #include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h" |
21 #include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h" | 22 #include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h" |
22 #include "webkit/glue/plugins/test/plugin_window_size_test.h" | 23 #include "webkit/glue/plugins/test/plugin_window_size_test.h" |
23 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
24 #include "webkit/glue/plugins/test/plugin_windowed_test.h" | 25 #include "webkit/glue/plugins/test/plugin_windowed_test.h" |
25 #endif | 26 #endif |
26 #include "webkit/glue/plugins/test/plugin_windowless_test.h" | 27 #include "webkit/glue/plugins/test/plugin_windowless_test.h" |
27 #include "third_party/npapi/bindings/npapi.h" | 28 #include "third_party/npapi/bindings/npapi.h" |
28 #include "third_party/npapi/bindings/npruntime.h" | 29 #include "third_party/npapi/bindings/npruntime.h" |
29 | 30 |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 } else if (test_name == "npobject_delete_plugin_in_evaluate") { | 163 } else if (test_name == "npobject_delete_plugin_in_evaluate") { |
163 new_test = new NPAPIClient::NPObjectDeletePluginInNPN_Evaluate(instance, | 164 new_test = new NPAPIClient::NPObjectDeletePluginInNPN_Evaluate(instance, |
164 NPAPIClient::PluginClient::HostFunctions()); | 165 NPAPIClient::PluginClient::HostFunctions()); |
165 #endif | 166 #endif |
166 } else if (test_name == "plugin_javascript_open_popup_with_plugin") { | 167 } else if (test_name == "plugin_javascript_open_popup_with_plugin") { |
167 new_test = new NPAPIClient::ExecuteJavascriptOpenPopupWithPluginTest( | 168 new_test = new NPAPIClient::ExecuteJavascriptOpenPopupWithPluginTest( |
168 instance, NPAPIClient::PluginClient::HostFunctions()); | 169 instance, NPAPIClient::PluginClient::HostFunctions()); |
169 } else if (test_name == "plugin_popup_with_plugin_target") { | 170 } else if (test_name == "plugin_popup_with_plugin_target") { |
170 new_test = new NPAPIClient::ExecuteJavascriptPopupWindowTargetPluginTest( | 171 new_test = new NPAPIClient::ExecuteJavascriptPopupWindowTargetPluginTest( |
171 instance, NPAPIClient::PluginClient::HostFunctions()); | 172 instance, NPAPIClient::PluginClient::HostFunctions()); |
| 173 } else if (test_name == "plugin_thread_async_call") { |
| 174 new_test = new NPAPIClient::PluginThreadAsyncCallTest( |
| 175 instance, NPAPIClient::PluginClient::HostFunctions()); |
172 } else if (test_name == "private") { | 176 } else if (test_name == "private") { |
173 new_test = new NPAPIClient::PrivateTest(instance, | 177 new_test = new NPAPIClient::PrivateTest(instance, |
174 NPAPIClient::PluginClient::HostFunctions()); | 178 NPAPIClient::PluginClient::HostFunctions()); |
175 } else if (test_name == "schedule_timer") { | 179 } else if (test_name == "schedule_timer") { |
176 new_test = new NPAPIClient::ScheduleTimerTest( | 180 new_test = new NPAPIClient::ScheduleTimerTest( |
177 instance, NPAPIClient::PluginClient::HostFunctions()); | 181 instance, NPAPIClient::PluginClient::HostFunctions()); |
178 #if defined(OS_WIN) | 182 #if defined(OS_WIN) |
179 // TODO(port): plugin_windowed_test.*. | 183 // TODO(port): plugin_windowed_test.*. |
180 } else if (test_name == "hidden_plugin" || | 184 } else if (test_name == "hidden_plugin" || |
181 test_name == "create_instance_in_paint" || | 185 test_name == "create_instance_in_paint" || |
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 (NPAPIClient::PluginTest*)instance->pdata; | 329 (NPAPIClient::PluginTest*)instance->pdata; |
326 | 330 |
327 return plugin->HandleEvent(event); | 331 return plugin->HandleEvent(event); |
328 } | 332 } |
329 | 333 |
330 void* NPP_GetJavaClass(void) { | 334 void* NPP_GetJavaClass(void) { |
331 // XXXMB - do work here. | 335 // XXXMB - do work here. |
332 return NULL; | 336 return NULL; |
333 } | 337 } |
334 } // extern "C" | 338 } // extern "C" |
OLD | NEW |