| 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 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 } | 131 } |
| 132 | 132 |
| 133 EXPECT_EQ(kTestCompleteSuccess, done_str); | 133 EXPECT_EQ(kTestCompleteSuccess, done_str); |
| 134 } | 134 } |
| 135 }; | 135 }; |
| 136 | 136 |
| 137 TEST_F(PluginTest, Quicktime) { | 137 TEST_F(PluginTest, Quicktime) { |
| 138 TestPlugin(L"quicktime.html", kShortWaitTimeout); | 138 TestPlugin(L"quicktime.html", kShortWaitTimeout); |
| 139 } | 139 } |
| 140 | 140 |
| 141 TEST_F(PluginTest, MediaPlayerNew) { | 141 TEST_F(PluginTest, DISABLED_MediaPlayerNew) { |
| 142 TestPlugin(L"wmp_new.html", kShortWaitTimeout); | 142 TestPlugin(L"wmp_new.html", kShortWaitTimeout); |
| 143 } | 143 } |
| 144 | 144 |
| 145 // http://crbug.com/4809 | 145 // http://crbug.com/4809 |
| 146 TEST_F(PluginTest, DISABLED_MediaPlayerOld) { | 146 TEST_F(PluginTest, DISABLED_MediaPlayerOld) { |
| 147 TestPlugin(L"wmp_old.html", kLongWaitTimeout); | 147 TestPlugin(L"wmp_old.html", kLongWaitTimeout); |
| 148 } | 148 } |
| 149 | 149 |
| 150 TEST_F(PluginTest, Real) { | 150 TEST_F(PluginTest, Real) { |
| 151 TestPlugin(L"real.html", kShortWaitTimeout); | 151 TestPlugin(L"real.html", kShortWaitTimeout); |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 } | 218 } |
| 219 | 219 |
| 220 TEST_F(ActiveXTest, WMP) { | 220 TEST_F(ActiveXTest, WMP) { |
| 221 TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false); | 221 TestActiveX(L"activex_wmp.html", kLongWaitTimeout, false); |
| 222 } | 222 } |
| 223 | 223 |
| 224 TEST_F(ActiveXTest, DISABLED_CustomScripting) { | 224 TEST_F(ActiveXTest, DISABLED_CustomScripting) { |
| 225 TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true); | 225 TestActiveX(L"activex_custom_scripting.html", kShortWaitTimeout, true); |
| 226 } | 226 } |
| 227 | 227 |
| 228 TEST_F(ActiveXTest, EmbeddedMP3) { | 228 TEST_F(ActiveXTest, DISABLED_EmbeddedMP3) { |
| 229 TestActiveX(L"mp3_test.html", kLongWaitTimeout, false); | 229 TestActiveX(L"mp3_test.html", kLongWaitTimeout, false); |
| 230 } | 230 } |
| 231 | 231 |
| 232 TEST_F(ActiveXTest, EmbeddedMPE) { | 232 TEST_F(ActiveXTest, EmbeddedMPE) { |
| 233 TestActiveX(L"mpe_test.html", kLongWaitTimeout, false); | 233 TestActiveX(L"mpe_test.html", kLongWaitTimeout, false); |
| 234 } | 234 } |
| 235 | 235 |
| 236 | 236 |
| 237 // The default plugin tests defined below rely on the following webkit | 237 // The default plugin tests defined below rely on the following webkit |
| 238 // functions and the IsPluginProcess function which is defined in the global | 238 // functions and the IsPluginProcess function which is defined in the global |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 activex_codebase, | 308 activex_codebase, |
| 309 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); | 309 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); |
| 310 | 310 |
| 311 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); | 311 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); |
| 312 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); | 312 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); |
| 313 | 313 |
| 314 EXPECT_EQ( | 314 EXPECT_EQ( |
| 315 activex_codebase, | 315 activex_codebase, |
| 316 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); | 316 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); |
| 317 } | 317 } |
| OLD | NEW |