Chromium Code Reviews| 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 207 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) { | |
| 229 TestActiveX(L"mp3_test.html", kLongWaitTimeout, false); | |
|
jam
2009/04/30 19:55:51
where is this file? ditto for below
| |
| 230 } | |
| 231 | |
| 232 TEST_F(ActiveXTest, EmbeddedMPE) { | |
| 233 TestActiveX(L"mpe_test.html", kLongWaitTimeout, false); | |
| 234 } | |
| 235 | |
| 236 | |
| 228 // The default plugin tests defined below rely on the following webkit | 237 // The default plugin tests defined below rely on the following webkit |
| 229 // functions and the IsPluginProcess function which is defined in the global | 238 // functions and the IsPluginProcess function which is defined in the global |
| 230 // namespace. Stubbed these out for now. | 239 // namespace. Stubbed these out for now. |
| 231 namespace webkit_glue { | 240 namespace webkit_glue { |
| 232 | 241 |
| 233 bool DownloadUrl(const std::string& url, HWND caller_window) { | 242 bool DownloadUrl(const std::string& url, HWND caller_window) { |
| 234 return false; | 243 return false; |
| 235 } | 244 } |
| 236 | 245 |
| 237 bool GetPluginFinderURL(std::string* plugin_finder_url) { | 246 bool GetPluginFinderURL(std::string* plugin_finder_url) { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 299 activex_codebase, | 308 activex_codebase, |
| 300 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); | 309 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); |
| 301 | 310 |
| 302 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); | 311 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); |
| 303 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); | 312 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); |
| 304 | 313 |
| 305 EXPECT_EQ( | 314 EXPECT_EQ( |
| 306 activex_codebase, | 315 activex_codebase, |
| 307 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); | 316 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); |
| 308 } | 317 } |
| OLD | NEW |