| Index: chrome_frame/chrome_frame.gyp
|
| ===================================================================
|
| --- chrome_frame/chrome_frame.gyp (revision 90713)
|
| +++ chrome_frame/chrome_frame.gyp (working copy)
|
| @@ -37,7 +37,6 @@
|
| '../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': [
|
| @@ -88,8 +87,6 @@
|
| ],
|
| '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',
|
| @@ -128,17 +125,10 @@
|
| '<(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': [
|
| @@ -211,7 +201,6 @@
|
| '../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',
|
| @@ -318,7 +307,6 @@
|
| '../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',
|
| @@ -395,7 +383,6 @@
|
| '../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',
|
| @@ -472,7 +459,6 @@
|
| '../testing/gmock.gyp:gmock',
|
| '../testing/gtest.gyp:gtest',
|
| 'chrome_frame_ie',
|
| - 'chrome_frame_npapi',
|
| 'chrome_frame_strings',
|
| 'chrome_tab_idl',
|
| ],
|
| @@ -542,7 +528,6 @@
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
|
| 'chrome_frame_ie',
|
| - 'chrome_frame_npapi',
|
| 'chrome_frame_strings',
|
| 'npchrome_frame',
|
| ],
|
| @@ -599,39 +584,6 @@
|
| ],
|
| },
|
| {
|
| - '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': {
|
| @@ -702,8 +654,6 @@
|
| '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',
|
| @@ -872,7 +822,6 @@
|
| 'dependencies': [
|
| '../base/base.gyp:base',
|
| 'chrome_frame_ie',
|
| - 'chrome_frame_npapi',
|
| 'chrome_frame_strings',
|
| 'chrome_frame_utils',
|
| 'chrome_tab_idl',
|
| @@ -887,9 +836,6 @@
|
| ],
|
| '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',
|
|
|