OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/plugins/npapi/test/plugin_test_factory.h" | 5 #include "webkit/plugins/npapi/test/plugin_test_factory.h" |
6 | 6 |
7 #include "webkit/plugins/npapi/test/plugin_arguments_test.h" | 7 #include "webkit/plugins/npapi/test/plugin_arguments_test.h" |
8 #include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h" | 8 #include "webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h" |
| 9 #include "webkit/plugins/npapi/test/plugin_delete_plugin_in_deallocate_test.h" |
9 #include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" | 10 #include "webkit/plugins/npapi/test/plugin_get_javascript_url_test.h" |
10 #include "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h" | 11 #include "webkit/plugins/npapi/test/plugin_get_javascript_url2_test.h" |
11 #include "webkit/plugins/npapi/test/plugin_geturl_test.h" | 12 #include "webkit/plugins/npapi/test/plugin_geturl_test.h" |
12 #include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h" | 13 #include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h" |
13 #include "webkit/plugins/npapi/test/plugin_new_fails_test.h" | 14 #include "webkit/plugins/npapi/test/plugin_new_fails_test.h" |
14 #include "webkit/plugins/npapi/test/plugin_npobject_identity_test.h" | 15 #include "webkit/plugins/npapi/test/plugin_npobject_identity_test.h" |
15 #include "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h" | 16 #include "webkit/plugins/npapi/test/plugin_npobject_lifetime_test.h" |
16 #include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" | 17 #include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h" |
17 #include "webkit/plugins/npapi/test/plugin_private_test.h" | 18 #include "webkit/plugins/npapi/test/plugin_private_test.h" |
18 #include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h" | 19 #include "webkit/plugins/npapi/test/plugin_schedule_timer_test.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
92 } else if (test_name == "hidden_plugin" || | 93 } else if (test_name == "hidden_plugin" || |
93 test_name == "create_instance_in_paint" || | 94 test_name == "create_instance_in_paint" || |
94 test_name == "alert_in_window_message" || | 95 test_name == "alert_in_window_message" || |
95 test_name == "ensure_scripting_works_in_destroy" || | 96 test_name == "ensure_scripting_works_in_destroy" || |
96 test_name == "invoke_js_function_on_create") { | 97 test_name == "invoke_js_function_on_create") { |
97 new_test = new WindowedPluginTest(instance, host_functions); | 98 new_test = new WindowedPluginTest(instance, host_functions); |
98 #endif | 99 #endif |
99 } else if (test_name == "setup") { | 100 } else if (test_name == "setup") { |
100 // "plugin" is the name for plugin documents. | 101 // "plugin" is the name for plugin documents. |
101 new_test = new PluginSetupTest(instance, host_functions); | 102 new_test = new PluginSetupTest(instance, host_functions); |
| 103 } else if (test_name == "delete_plugin_in_deallocate_test") { |
| 104 new_test = new DeletePluginInDeallocateTest(instance, host_functions); |
102 } | 105 } |
103 | 106 |
104 return new_test; | 107 return new_test; |
105 } | 108 } |
106 | 109 |
107 } // namespace NPAPIClient | 110 } // namespace NPAPIClient |
OLD | NEW |