Remove NPAPI support from Chrome Frame.

chrome_frame/test/test_with_web_server.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #pragma once
 
 #include <windows.h>
 #include <string>
@@ skipping 122 matching lines @@
   }
 
  private:
   // Holds the results of tests which post success/failure.
   std::string posted_result_;
   std::string expected_result_;
 };
 
 // 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"
 //    webserver directory
 class ChromeFrameTestWithWebServer: public testing::Test {
  public:
   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);
   // Waits for the page to notify us of the window.onload event firing.
   // Note that the milliseconds value is only approximate.
   bool WaitForOnLoad(int milliseconds);
 
   // Launches the specified browser and waits for the test to complete
   // (see WaitForTestToComplete).  Then checks that the outcome is equal
   // to the expected result.
   // This function uses EXPECT_TRUE and ASSERT_TRUE for all steps performed
   // hence no return value.
   void SimpleBrowserTestExpectedResult(BrowserKind browser,
       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);
 
   // Closes all browsers in preparation for a test and during cleanup.
   void CloseAllBrowsers();
 
   void CloseBrowser();
 
   // Ensures (well, at least tries to ensure) that the browser window has focus.
   bool BringBrowserToTop();
 
   const FilePath& GetCFTestFilePath() {
     return test_file_path_;
   }
 
   virtual void SetUp();
   virtual void TearDown();
 
   // Important: kind means "sheep" in Icelandic. ?:-o
   const char* ToString(BrowserKind kind) {
     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;
     }
     return "";
   }
 
   BrowserKind browser_;
   FilePath results_dir_;
   base::win::ScopedHandle browser_handle_;
@@ skipping 118 matching lines @@
 // Same as above except that the response does not include the no-cache header.
 ACTION_P2(SendAllowCacheResponse, server, invocation) {
   server->SendResponseHelper(arg0, arg1, invocation, false);
 }
 
 ACTION_P2(HandlePostedResponseHelper, server, invocation) {
   server->HandlePostedResponse(arg0, arg2);
 }
 
 #endif  // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_