Adding a privileged callback used in IE CF to check whether to show...

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': {
       'version_py_path': '../tools/build/version.py',
       'version_path': 'VERSION',
     },
     'version_py_path': '<(version_py_path) -f',
     'version_path': '<(version_path)',
 
     # Keep the archive builder happy.
     'chrome_personalization%': 1,
     'use_syncapi_stub%': 0,
 
     # Deps info.
     'xul_include_directories': [
       '<(xul_sdk_dir)/include/caps',
       '<(xul_sdk_dir)/include/dom',
       '<(xul_sdk_dir)/include/js',
       '<(xul_sdk_dir)/include/nspr',
       '<(xul_sdk_dir)/include/string',
       '<(xul_sdk_dir)/include/xpcom',
       '<(xul_sdk_dir)/include/xpconnect',
-    ],  
+    ],
     'conditions': [
       ['OS=="win"', {
         'python': [
           '<(DEPTH)\\third_party\\python_24\\setup_env.bat && python'
         ],
       }, { # OS != win
         'python': [
           'python'
         ],
       }],
@@ skipping 40 matching lines @@
             'libraries': [
               '../third_party/xulrunner-sdk/win/lib/xpcomglue_s.lib',
               '../third_party/xulrunner-sdk/win/lib/xpcom.lib',
               '../third_party/xulrunner-sdk/win/lib/nspr4.lib',
             ],
           },
         },],
       ],
     },
     {
+      # Builds our IDL file to the shared intermediate directory.
+      'target_name': 'chrome_tab_idl',
+      'type': 'none',
+      'msvs_settings': {
+        'VCMIDLTool': {
+          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)',
+        },
+      },
+      'sources': [
+        'chrome_tab.idl',
+      ],
+      # Add the output dir for those who depend on us.
+      'direct_dependent_settings': {
+        'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'],
+      },
+    },
+    {
+      'target_name': 'chrome_frame_privileged_mock',
+      'type': 'none',
+      'dependencies': [
+        'chrome_tab_idl',
+      ],
+      'sources': [
+        '../ceee/testing/utils/com_mock.py',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+      ],
+      'actions': [
+        {
+          'action_name': 'make_chrome_frame_privileged_mock',
+          'msvs_cygwin_shell': 0,
+          'msvs_quote_cmd': 0,
+          'inputs': [
+            '../ceee/testing/utils/com_mock.py',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/mock_ichromeframeprivileged.gen',
+          ],
+          'action': [
+            '<@(python)',
+            '../ceee/testing/utils/com_mock.py',
+            'IChromeFramePrivileged',
+            '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+            '> "<(SHARED_INTERMEDIATE_DIR)/mock_ichromeframeprivileged.gen"',
+          ],
+        },
+      ],
+      # All who use this need to be able to find the .gen file we generate.
+      'all_dependent_settings': {
+        'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'],
+      },
+    },
+    {
       'target_name': 'chrome_frame_unittests',
       'type': 'executable',
       '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',
       ],
       'sources': [
         'chrome_tab.h',
-        'chrome_tab.idl',
         '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_frame_activex_unittest.cc',
+        'test/chrome_tab_mocks.h',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_test_utils.cc',
         'test/com_message_event_unittest.cc',
         'test/exception_barrier_unittest.cc',
         'test/html_util_unittests.cc',
         'test/http_negotiate_unittest.cc',
         'test/policy_settings_unittest.cc',
         'test/simulate_input.h',
         'test/simulate_input.cc',
         'test/urlmon_moniker_tests.h',
         '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': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-      ],
       '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'],
                 },
               },
               'dependencies': [
                 # TODO(slightlyoff): Get automation targets working on OS X
                 '../chrome/chrome.gyp:automation',
               ],
             }],
-          ],        
+          ],
         }],
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-lshdocvw.lib', '-loleacc.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
               'DelayLoadDLLs': ['shdocvw.dll'],
@@ skipping 31 matching lines @@
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../net/net.gyp:net_test_support',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../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',
@@ skipping 24 matching lines @@
         'test/test_with_web_server.cc',
         'test/test_with_web_server.h',
         'test/ui_test.cc',
         'test/urlmon_moniker_tests.h',
         'test/urlmon_moniker_integration_test.cc',
         'test/url_request_test.cc',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'chrome_launcher_version.rc',
         'chrome_tab.h',
-        'chrome_tab.idl',
         'test_utils.cc',
         'test_utils.h',
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
         '<(DEPTH)/third_party/wtl/include',
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
@@ skipping 43 matching lines @@
         '../chrome/chrome.gyp:test_support_ui',
         '../chrome/chrome.gyp:utility',
         '../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',
         'xulrunner_sdk',
       ],
       'sources': [
         '../base/perf_test_suite.h',
         '../base/perftimer.cc',
         '../base/test/test_file_util.h',
         '../chrome/test/chrome_process_util.cc',
         '../chrome/test/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
         'chrome_tab.h',
-        'chrome_tab.idl',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
         'test/perf/chrome_frame_perftest.h',
         'test/perf/run_all.cc',
         'test/perf/silverlight.cc',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test_utils.cc',
         'test_utils.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
         '<(DEPTH)/third_party/wtl/include',
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
@@ skipping 29 matching lines @@
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:syncapi',
         '../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',
       ],
       'sources': [
         '../net/url_request/url_request_unittest.cc',
         '../net/url_request/url_request_unittest.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test/test_server.cc',
         'test/test_server.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'test/net/fake_external_tab.cc',
         'test/net/fake_external_tab.h',
         'test/net/process_singleton_subclass.cc',
         'test/net/process_singleton_subclass.h',
         'test/net/test_automation_provider.cc',
         'test/net/test_automation_provider.h',
         'test/net/test_automation_resource_message_filter.cc',
         'test/net/test_automation_resource_message_filter.h',
         'chrome_tab.h',
-        'chrome_tab.idl',
-      ],
-      'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
           },
           'msvs_settings': {
             'VCLinkerTool': {
@@ skipping 30 matching lines @@
         '../base/base.gyp:test_support_base',
         '../chrome/chrome.gyp:browser',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:test_support_common',
         '../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',
         'test/ie_event_sink.cc',
         'test/ie_event_sink.h',
         'test_utils.cc',
         'test_utils.h',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'chrome_tab.h',
-        'chrome_tab.idl',
         '../base/test/test_file_util_win.cc',
         '../chrome/test/ui/ui_test.cc',
         '../chrome/test/ui/ui_test_suite.cc',
         '../chrome/test/ui/ui_test_suite.h',
         '../chrome/test/chrome_process_util.cc',
         '../chrome/test/chrome_process_util.h',
       ],
-      'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-      ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
           },
           'dependencies': [
             # TODO(slightlyoff): Get automation targets working on OS X
             '../chrome/chrome.gyp:automation',
             '../chrome/chrome.gyp:installer_util',
             '../google_update/google_update.gyp:google_update',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }],
       ],
     },
-
+    {
+      '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',
         'xulrunner_sdk',
       ],
       'sources': [
         'chrome_frame_npapi.cc',
         'chrome_frame_npapi.h',
         'ff_30_privilege_check.cc',
         'ff_privilege_check.h',
-        'np_browser_functions.cc',
-        'np_browser_functions.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',
@@ skipping 10 matching lines @@
           'inputs': [
             '../tools/grit/grit.py',
           ],
           'variables': {
             'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
           },
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/grit/<(RULE_INPUT_ROOT).h',
             '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/<(RULE_INPUT_ROOT).pak',
           ],
-          'action': ['python', '<@(_inputs)', '-i', 
+          'action': ['python', '<@(_inputs)', '-i',
             '<(RULE_INPUT_PATH)',
             'build', '-o', '<(grit_out_dir)'
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
       ],
       'sources': [
         # Localizable resources.
         'resources/chrome_frame_resources.grd',
       ],
@@ skipping 12 matching lines @@
       'target_name': 'chrome_frame_utils',
        # The intent is that shared util code can be built into a separate lib.
        # Currently on the resource loading code is here.
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base_i18n',
         '../breakpad/breakpad.gyp:breakpad_handler',
         '../chrome/chrome.gyp:chrome_version_header',
       ],
       'include_dirs': [
-        # To allow including "chrome_tab.h"
+        # To allow including "version.h"
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'crash_server_init.cc',
         'crash_server_init.h',
         'simple_resource_loader.cc',
         'simple_resource_loader.h',
       ],
     },
     {
       'target_name': 'chrome_frame_ie',
       'type': 'static_library',
       'dependencies': [
         'chrome_frame_common',
         'chrome_frame_strings',
         'chrome_frame_utils',
+        'chrome_tab_idl',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../webkit/support/webkit_support.gyp:webkit_user_agent',
       ],
       'sources': [
         'bho.cc',
         'bho.h',
@@ skipping 10 matching lines @@
         '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',
         'chrome_tab.h',
-        'chrome_tab.idl',
         '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',
         'exception_barrier.cc',
         'exception_barrier.h',
         'exception_barrier_lowlevel.asm',
         'find_dialog.cc',
@@ skipping 27 matching lines @@
         'urlmon_url_request.h',
         'urlmon_url_request_private.h',
         'urlmon_upload_data_stream.cc',
         'urlmon_upload_data_stream.h',
         'utils.h',
         'utils.cc',
         'vtable_patch_manager.cc',
         'vtable_patch_manager.h',
       ],
       'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
         '<(INTERMEDIATE_DIR)/../chrome_frame',
         '<(DEPTH)/third_party/wtl/include',
       ],
       'conditions': [
         ['OS=="win"', {
           # NOTE(slightlyoff):
           #   this is a fix for the include dirs length limit on the resource
           #   compiler, tickled by the xul_include_dirs variable
           'resource_include_dirs': [
             '<(INTERMEDIATE_DIR)'
@@ skipping 67 matching lines @@
     {
       'target_name': 'npchrome_frame',
       'type': 'shared_library',
       'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
       'dependencies': [
         '../base/base.gyp:base',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_frame_utils',
+        'chrome_tab_idl',
         'xulrunner_sdk',
         '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_version_header',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
       ],
       'sources': [
         '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',
         'chrome_tab.h',
-        'chrome_tab.idl',
         # 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',
         'renderer_glue.cc',
         'resource.h',
       ],
       'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
         '<(INTERMEDIATE_DIR)/../npchrome_frame',
       ],
       'conditions': [
         ['OS=="win"', {
           # NOTE(slightlyoff):
           #   this is a fix for the include dirs length limit on the resource
           #   compiler, tickled by the xul_include_dirs variable
           'resource_include_dirs': [
             '<(INTERMEDIATE_DIR)'
           ],
@@ skipping 76 matching lines @@
           'suppress_wildcard': 1,
           'type': 'none',
           'dependencies': [
             # Some tests are disabled because they depend on browser.lib which
             # has some trouble to link with instrumentation. Until this is
             # fixed on the Chrome side we won't get complete coverage from
             # our tests but we at least get the process rolling...
             # TODO(mad): FIX THIS!
             #'chrome_frame_net_tests',
             #'chrome_frame_reliability_tests',
-            
+
             # Other tests depend on Chrome bins being available when they run.
             # Those should be re-enabled as soon as we setup the build slave to
             # also build (or download an archive of) Chrome, even it it isn't
             # instrumented itself.
             # TODO(mad): FIX THIS!
             #'chrome_frame_perftests',
             #'chrome_frame_tests',
 
             'chrome_frame_unittests',
           ],  # 'dependencies'
@@ skipping 72 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: