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

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

Issue 201051: Fix a build break by removing some webkit_glue stub functions from plugin_tes... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 3 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 | « no previous file | no next file » | 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 } 242 }
243 243
244 TEST_F(ActiveXTest, DISABLED_EmbeddedMP3) { 244 TEST_F(ActiveXTest, DISABLED_EmbeddedMP3) {
245 TestActiveX(L"mp3_test.html", kLongWaitTimeout, false); 245 TestActiveX(L"mp3_test.html", kLongWaitTimeout, false);
246 } 246 }
247 247
248 TEST_F(ActiveXTest, DISABLED_EmbeddedMPE) { 248 TEST_F(ActiveXTest, DISABLED_EmbeddedMPE) {
249 TestActiveX(L"mpe_test.html", kLongWaitTimeout, false); 249 TestActiveX(L"mpe_test.html", kLongWaitTimeout, false);
250 } 250 }
251 251
252 252 TEST_F(PluginTest, DISABLED_DefaultPluginParsingTest) {
253 // The default plugin tests defined below rely on the following webkit
254 // functions and the IsPluginProcess function which is defined in the global
255 // namespace. Stubbed these out for now.
256 namespace webkit_glue {
257
258 bool DownloadUrl(const std::string& url, HWND caller_window) {
259 return false;
260 }
261
262 bool GetPluginFinderURL(std::string* plugin_finder_url) {
263 return true;
264 }
265
266 } // namespace webkit_glue
267
268 bool IsPluginProcess() {
269 return false;
270 }
271
272 TEST_F(PluginTest, DefaultPluginParsingTest) {
273 PluginInstallerImpl plugin_installer(NP_EMBED); 253 PluginInstallerImpl plugin_installer(NP_EMBED);
274 NPP_t plugin_instance = {0}; 254 NPP_t plugin_instance = {0};
275 255
276 char *arg_names[] = { 256 char *arg_names[] = {
277 "classid", 257 "classid",
278 "codebase" 258 "codebase"
279 }; 259 };
280 260
281 char *arg_values[] = { 261 char *arg_values[] = {
282 "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000", 262 "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 activex_codebase, 304 activex_codebase,
325 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); 305 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
326 306
327 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}"); 307 EXPECT_EQ(activex_clsid, "{D27CDB6E-AE6D-11cf-96B8-444553540000}");
328 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000"); 308 EXPECT_EQ(raw_activex_clsid, "D27CDB6E-AE6D-11cf-96B8-444553540000");
329 309
330 EXPECT_EQ( 310 EXPECT_EQ(
331 activex_codebase, 311 activex_codebase,
332 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab"); 312 "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab");
333 } 313 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698