| OLD | NEW |
| 1 // Copyright 2008-2009, Google Inc. | 1 // Copyright 2008-2009, Google Inc. |
| 2 // All rights reserved. | 2 // All rights reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
| 9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
| 10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 TEST_F(PluginTest, FlashOctetStream) { | 163 TEST_F(PluginTest, FlashOctetStream) { |
| 164 TestPlugin(L"flash-octet-stream.html", kShortWaitTimeout, false); | 164 TestPlugin(L"flash-octet-stream.html", kShortWaitTimeout, false); |
| 165 } | 165 } |
| 166 | 166 |
| 167 TEST_F(PluginTest, FlashSecurity) { | 167 TEST_F(PluginTest, FlashSecurity) { |
| 168 TestPlugin(L"flash.html", kShortWaitTimeout, false); | 168 TestPlugin(L"flash.html", kShortWaitTimeout, false); |
| 169 } | 169 } |
| 170 | 170 |
| 171 // http://crbug.com/16114 | 171 // http://crbug.com/16114 |
| 172 TEST_F(PluginTest, FlashLayoutWhilePainting) { | 172 // Disabled for http://crbug.com/21538 |
| 173 TEST_F(PluginTest, DISABLED_FlashLayoutWhilePainting) { |
| 173 TestPlugin(L"flash-layout-while-painting.html", kShortWaitTimeout, true); | 174 TestPlugin(L"flash-layout-while-painting.html", kShortWaitTimeout, true); |
| 174 } | 175 } |
| 175 | 176 |
| 176 // http://crbug.com/8690 | 177 // http://crbug.com/8690 |
| 177 TEST_F(PluginTest, DISABLED_Java) { | 178 TEST_F(PluginTest, DISABLED_Java) { |
| 178 TestPlugin(L"Java.html", kShortWaitTimeout, false); | 179 TestPlugin(L"Java.html", kShortWaitTimeout, false); |
| 179 } | 180 } |
| 180 | 181 |
| 181 TEST_F(PluginTest, Silverlight) { | 182 // Disabled for http://crbug.com/22666 |
| 183 TEST_F(PluginTest, DISABLED_Silverlight) { |
| 182 TestPlugin(L"silverlight.html", kShortWaitTimeout, false); | 184 TestPlugin(L"silverlight.html", kShortWaitTimeout, false); |
| 183 } | 185 } |
| OLD | NEW |