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

Unified Diff: chrome_frame/test/test_with_web_server.h

Issue 7276037: Remove NPAPI support from Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_with_web_server.h
===================================================================
--- chrome_frame/test/test_with_web_server.h (revision 90713)
+++ chrome_frame/test/test_with_web_server.h (working copy)
@@ -140,7 +140,7 @@
// Class that:
// 1) Starts the local webserver,
-// 2) Supports launching browsers - Internet Explorer and Firefox with local url
+// 2) Supports launching browsers - Internet Explorer with local url
// 3) Wait the webserver to finish. It is supposed the test webpage to shutdown
// the server by navigating to "kill" page
// 4) Supports read the posted results from the test webpage to the "dump"
@@ -150,7 +150,7 @@
ChromeFrameTestWithWebServer();
protected:
- enum BrowserKind { INVALID, IE, FIREFOX, OPERA, SAFARI, CHROME };
+ enum BrowserKind { INVALID, IE, CHROME };
bool LaunchBrowser(BrowserKind browser, const wchar_t* url);
bool WaitForTestToComplete(int milliseconds);
@@ -167,12 +167,6 @@
const wchar_t* page, const char* result);
void SimpleBrowserTest(BrowserKind browser, const wchar_t* page);
- // Same as SimpleBrowserTest but if the browser isn't installed (LaunchBrowser
- // fails), the function will print out a warning but not treat the test
- // as failed.
- // Currently this is how we run Opera tests.
- void OptionalBrowserTest(BrowserKind browser, const wchar_t* page);
-
// Test if chrome frame correctly reports its version.
void VersionTest(BrowserKind browser, const wchar_t* page);
@@ -196,14 +190,8 @@
switch (kind) {
case IE:
return "IE";
- case FIREFOX:
- return "Firefox";
- case OPERA:
- return "Opera";
case CHROME:
return "Chrome";
- case SAFARI:
- return "Safari";
default:
NOTREACHED();
break;
« no previous file with comments | « chrome_frame/test/chrome_frame_test_utils.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698