Get rid of the dependency of a number of chrome frame projects on the xulrunn...

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2010 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,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     'variables': {
@@ skipping 134 matching lines @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../ceee/ie/common/common.gyp:ie_common',
         '../ceee/testing/utils/test_utils.gyp:test_utils',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         'chrome_frame_ie',
         'chrome_frame_privileged_mock',
         'chrome_frame_strings',
         'chrome_tab_idl',
+        'xulrunner_sdk',
       ],
       'sources': [
         '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',
@@ skipping 16 matching lines @@
         'test/urlmon_moniker_unittest.cc',
         'test/util_unittests.cc',
         'test/win_event_receiver.h',
         'test/win_event_receiver.cc',
         'unittest_precompile.h',
         'unittest_precompile.cc',
         'urlmon_upload_data_stream.cc',
         'urlmon_upload_data_stream_unittest.cc',
         'vtable_patch_manager_unittest.cc',
       ],
+      'include_dirs': [
+        '<@(xul_include_directories)',
+      ],
       '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
         # 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',
-            'xulrunner_sdk',
           ],
           'sources': [
             'chrome_frame_npapi_unittest.cc',
           ],
           'conditions': [
             ['OS=="win"', {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'DelayLoadDLLs': ['xpcom.dll', 'nspr4.dll'],
                 },
@@ skipping 52 matching lines @@
         '../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',
-        'xulrunner_sdk',
       ],
       'sources': [
         '../base/test_suite.h',
         'cfproxy_test.cc',
         'external_tab_test.cc',
         'test/automation_client_mock.cc',
         'test/automation_client_mock.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_ui_test_utils.cc',
@@ skipping 138 matching lines @@
             },
           },
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'IgnoreDefaultLibraryNames': ['nspr.lib', 'nspr4.lib'],
-              'DelayLoadDLLs': ['nspr4.dll'],
             },
           },
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../chrome/chrome.gyp:automation',
             '../chrome/chrome.gyp:crash_service',
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ],
           'sources': [
@@ skipping 235 matching lines @@
     },
     {
       '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',
-        'xulrunner_sdk',
       ],
       'sources': [
         'chrome_frame_npapi.cc',
         'chrome_frame_npapi.h',
         'ff_30_privilege_check.cc',
         'ff_privilege_check.h',
         'np_event_listener.cc',
         'np_event_listener.h',
         'np_proxy_service.cc',
         'np_proxy_service.h',
         'np_utils.cc',
         'np_utils.h',
         'npapi_url_request.cc',
         'npapi_url_request.h',
         'ns_associate_iid_win.h',
         'ns_isupports_impl.h',
         'scoped_ns_ptr_win.h',
       ],
+      'include_dirs': [
+        '<@(xul_include_directories)',
+      ],
     },
     {
       'target_name': 'chrome_frame_strings',
       'type': 'none',
       'rules': [
         {
           'rule_name': 'grit',
           'extension': 'grd',
           'inputs': [
             '../tools/grit/grit.py',
@@ skipping 459 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: