Remove NPAPI support from Chrome Frame.

chrome_frame/chrome_frame.gyp

 # 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': '../tools/build/version.py',
@@ skipping 19 matching lines @@
     ],
   },
   'target_defaults': {
     'dependencies': [
       # locales need to be built for the chrome frame binaries to be loadable.
       '../chrome/app/locales/locales.gyp:*',
       '../chrome/chrome.gyp:chrome_resources',
       '../chrome/chrome.gyp:chrome_strings',
       '../chrome/chrome.gyp:theme_resources',
       '../skia/skia.gyp:skia',
-      '../third_party/npapi/npapi.gyp:npapi',
     ],
     'defines': [ 'ISOLATION_AWARE_ENABLED=1' ],
     'include_dirs': [
       # all our own includes are relative to src/
       '..',
     ],
   },
   'targets': [
     {
       # Builds the crash tests in crash_reporting.
@@ skipping 30 matching lines @@
         '../net/net.gyp:net',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'chrome_frame_launcher.gyp:chrome_frame_helper_lib',
         'chrome_frame_ie',
         'chrome_frame_strings',
         'chrome_tab_idl',
       ],
       'sources': [
         '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
-        'chrome_frame_histograms.h',
-        'chrome_frame_histograms.cc',
         'chrome_frame_unittest_main.cc',
         'chrome_launcher.cc',
         'chrome_launcher.h',
         'chrome_launcher_unittest.cc',
         'function_stub_unittest.cc',
         'renderer_glue.cc',
         'test/chrome_tab_mocks.h',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_test_utils.cc',
         'test/com_message_event_unittest.cc',
@@ skipping 18 matching lines @@
         'vtable_patch_manager_unittest.cc',
       ],
       'include_dirs': [
         '<(DEPTH)/breakpad/src',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
-        # We needed to extract this test from the chrome_frame_unittests because
-        # we can't instrument code for coverage if it depends on 3rd party
+        # We can't instrument code for coverage if it depends on 3rd party
         # binaries that we don't have PDBs for. See here for more details:
         # http://connect.microsoft.com/VisualStudio/feedback/details/176188/can-not-disable-warning-lnk4099
         ['coverage==0', {
-          'dependencies': [
-            'chrome_frame_npapi',
-          ],
-          'sources': [
-            'chrome_frame_npapi_unittest.cc',
-          ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad_handler',              
                 # TODO(slightlyoff): Get automation targets working on OS X
                 '../chrome/chrome.gyp:automation',
               ],
             }],
           ],
         }],
@@ skipping 52 matching lines @@
         '../chrome/installer/upgrade_test.gyp:alternate_version_generator_lib',
         '../content/content.gyp:content_gpu',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         '../third_party/iaccessible2/iaccessible2.gyp:IAccessible2Proxy',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_ie',
-        'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_tab_idl',
         'npchrome_frame',
       ],
       'sources': [
         '../base/test/test_suite.h',
         'cfproxy_test.cc',
         'external_tab_test.cc',
         'test/automation_client_mock.cc',
@@ skipping 86 matching lines @@
         '../chrome/chrome.gyp:browser',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:test_support_ui',
         '../chrome/chrome.gyp:utility',
         '../content/content.gyp:content_gpu',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_ie',
-        'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_tab_idl',
         'npchrome_frame',
       ],
       'sources': [
         '../base/test/perf_test_suite.h',
         '../base/perftimer.cc',
         '../base/test/test_file_util.h',
         '../chrome/test/chrome_process_util.cc',
@@ skipping 56 matching lines @@
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:syncapi_core',
         '../content/content.gyp:content_gpu',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
-        'chrome_frame_npapi',
         'chrome_frame_ie',
         'chrome_tab_idl',
         'npchrome_frame',
       ],
       'include_dirs': [
         '<(DEPTH)/breakpad/src',
       ],
       'sources': [
         '../net/url_request/url_request_unittest.cc',
         'test/chrome_frame_test_utils.cc',
@@ skipping 56 matching lines @@
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../chrome/chrome.gyp:browser',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:test_support_common',
         '../content/content.gyp:content_gpu',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'chrome_frame_ie',
-        'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_tab_idl',
       ],
       'sources': [
         'test/reliability/run_all_unittests.cc',
         'test/reliability/page_load_test.cc',
         'test/reliability/page_load_test.h',
         'test/reliability/reliability_test_suite.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
@@ skipping 49 matching lines @@
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         'chrome_frame_ie',
-        'chrome_frame_npapi',
         'chrome_frame_strings',
         'npchrome_frame',
       ],
       'sources': [
         '../base/test/test_suite.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_ui_test_utils.cc',
         'test/chrome_frame_ui_test_utils.h',
         'test/external_sites_test.cc',
@@ skipping 36 matching lines @@
           'dependencies': [
             '../chrome/chrome.gyp:crash_service',
             '../chrome/chrome.gyp:automation',
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ]
         }],
       ],
     },
     {
-      'target_name': 'chrome_frame_npapi_core',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'sources': [
-        'np_browser_functions.cc',
-        'np_browser_functions.h',
-      ],
-    },
-    {
-      'target_name': 'chrome_frame_npapi',
-      'type': 'static_library',
-      'dependencies': [
-        'chrome_frame_common',
-        'chrome_frame_npapi_core',
-        'chrome_frame_strings',
-        'chrome_frame_utils',
-        '../chrome/chrome.gyp:common',
-        '../net/net.gyp:net',
-      ],
-      'sources': [
-        'chrome_frame_npapi.cc',
-        'chrome_frame_npapi.h',
-        'np_utils.cc',
-        'np_utils.h',
-        'npapi_url_request.cc',
-        'npapi_url_request.h',
-      ],
-      'include_dirs': [
-      ],
-    },
-    {
       'target_name': 'chrome_frame_strings',
       'type': 'none',
       'variables': {
         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
       },
       'actions': [
         {
           'action_name': 'chrome_frame_resources',
           'variables': {
             'grit_grd_file': 'resources/chrome_frame_resources.grd',
@@ skipping 50 matching lines @@
         'bind_status_callback_impl.h',
         'buggy_bho_handling.cc',
         'buggy_bho_handling.h',
         'chrome_active_document.cc',
         'chrome_active_document.h',
         'chrome_active_document.rgs',
         'chrome_frame_activex.cc',
         'chrome_frame_activex.h',
         'chrome_frame_activex.rgs',
         'chrome_frame_activex_base.h',
-        'chrome_frame_histograms.cc',
-        'chrome_frame_histograms.h',
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'com_message_event.cc',
         'com_message_event.h',
         'com_type_info_holder.cc',
         'com_type_info_holder.h',
         'delete_chrome_history.cc',
         'delete_chrome_history.h',
@@ skipping 148 matching lines @@
       'export_dependent_settings': [
         '../base/base.gyp:base',
       ],
     },
     {
       'target_name': 'npchrome_frame',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         'chrome_frame_ie',
-        'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
         'chrome_tab_idl',
         'chrome_frame_launcher.gyp:chrome_launcher',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         'chrome_frame_launcher.gyp:chrome_frame_helper',
         'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
         '../chrome/chrome.gyp:chrome',
         '../chrome/chrome.gyp:chrome_dll',
         '../chrome/chrome.gyp:chrome_dll_version',
         '../chrome/chrome.gyp:common',
       ],
       'sources': [
         'chrome_frame_elevation.rgs',
-        'chrome_frame_npapi.rgs',
-        'chrome_frame_npapi_entrypoints.cc',
-        'chrome_frame_npapi_entrypoints.h',
         'chrome_frame_reporting.cc',
         'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
         '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
         'chrome_tab.rgs',
         'chrome_tab_version.rc',
@@ skipping 189 matching lines @@
   ],  # 'conditions'
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: