Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(141)

Side by Side Diff: chrome/test/plugin/plugin_test.cpp

Issue 72004: Relanding the following revisions.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome.sln ('k') | webkit/activex_shim/activex_shared.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 }; 214 };
215 215
216 TEST_F(ActiveXTest, EmbeddedWMP) { 216 TEST_F(ActiveXTest, EmbeddedWMP) {
217 TestActiveX(L"activex_embedded_wmp.html", kLongWaitTimeout, false); 217 TestActiveX(L"activex_embedded_wmp.html", kLongWaitTimeout, false);
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, 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 // The default plugin tests defined below rely on the following webkit 228 // The default plugin tests defined below rely on the following webkit
229 // functions and the IsPluginProcess function which is defined in the global 229 // functions and the IsPluginProcess function which is defined in the global
230 // namespace. Stubbed these out for now. 230 // namespace. Stubbed these out for now.
231 namespace webkit_glue { 231 namespace webkit_glue {
232 232
233 bool DownloadUrl(const std::string& url, HWND caller_window) { 233 bool DownloadUrl(const std::string& url, HWND caller_window) {
234 return false; 234 return false;
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 activex_codebase, 299 activex_codebase,
300 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); 300 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
301 301
302 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); 302 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}");
303 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); 303 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000");
304 304
305 EXPECT_EQ( 305 EXPECT_EQ(
306 activex_codebase, 306 activex_codebase,
307 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); 307 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
308 } 308 }
OLDNEW
« no previous file with comments | « chrome/chrome.sln ('k') | webkit/activex_shim/activex_shared.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698