Revert 105803 - Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIA...

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 44 matching lines @@
         'crash_reporting/crash_reporting.gyp:minidump_test',
         'crash_reporting/crash_reporting.gyp:vectored_handler_tests',
       ],
     },
     {
       # Builds our IDL file to the shared intermediate directory.
       'target_name': 'chrome_tab_idl',
       'type': 'none',
       'msvs_settings': {
         'VCMIDLTool': {
-          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
+          '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_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../chrome/app/policy/cloud_policy_codegen.gyp:policy',
         '../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',
         'locales/locales.gyp:*',
       ],
       'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '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 139 matching lines @@
         'test/test_server_test.cc',
         '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',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'test_utils.cc',
         'test_utils.h',
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/wtl/include',
         '<(DEPTH)/breakpad/src',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
@@ skipping 54 matching lines @@
         'locales/locales.gyp:*',
         'npchrome_frame',
       ],
       'sources': [
         '../base/test/perf_test_suite.h',
         '../base/perftimer.cc',
         '../base/test/test_file_util.h',
         '../chrome/test/base/chrome_process_util.cc',
         '../chrome/test/base/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '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',
@@ skipping 69 matching lines @@
         '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',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         'test_utils.cc',
         'test_utils.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
@@ skipping 50 matching lines @@
         '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',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         '../base/test/test_file_util_win.cc',
         '../chrome/test/automation/proxy_launcher.cc',
         '../chrome/test/automation/proxy_launcher.h',
         '../chrome/test/base/chrome_process_util.cc',
         '../chrome/test/base/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
         '../chrome/test/ui/ui_test.h',
         '../chrome/test/ui/ui_test_suite.cc',
         '../chrome/test/ui/ui_test_suite.h',
       ],
@@ skipping 55 matching lines @@
         'test/mock_ie_event_sink_test.h',
         'test/run_all_unittests.cc',
         'test/simulate_input.cc',
         'test/simulate_input.h',
         'test/test_server.cc',
         'test/test_server.h',
         'test/test_with_web_server.cc',
         'test/test_with_web_server.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
         'chrome_tab.idl',
         'renderer_glue.cc',
         'test_utils.cc',
         'test_utils.h',
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/wtl/include',
         '<(DEPTH)/breakpad/src',
+        # To allow including "chrome_tab.h"
+        '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
       ],
       'conditions': [
         ['OS=="win"', {
           'link_settings': {
             'libraries': [
               '-loleacc.lib',
             ],
@@ skipping 35 matching lines @@
       'target_name': 'chrome_frame_utils',
        # The intent is that shared util code can be built into a separate lib.
       '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 "version.h"
-        # TODO(grt): remove this as per http://crbug.com/99368
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
         'crash_server_init.cc',
         'crash_server_init.h',
         'simple_resource_loader.cc',
         'simple_resource_loader.h',
       ],
     },
     {
@@ skipping 28 matching lines @@
         '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_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(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',
         'dll_redirector.cc',
         'dll_redirector.h',
         'exception_barrier.cc',
         'exception_barrier.h',
@@ skipping 49 matching lines @@
         'urlmon_upload_data_stream.cc',
         'urlmon_upload_data_stream.h',
         'utils.h',
         'utils.cc',
         'vtable_patch_manager.cc',
         'vtable_patch_manager.h',
         '../third_party/active_doc/in_place_menu.h',
         '../third_party/active_doc/ole_document_impl.h',
       ],
       'include_dirs': [
+        '<(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 93 matching lines @@
         '../chrome/chrome.gyp:chrome_dll',
         '../chrome/chrome.gyp:chrome_version_resources',
         '../chrome/chrome.gyp:common',
       ],
       'sources': [
         'chrome_frame_elevation.rgs',
         'chrome_frame_reporting.cc',
         'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
+        '<(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',
         'renderer_glue.cc',
         'resource.h',
       ],
       'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
-      ],
-      'resource_include_dirs': [
-        # To pick up chrome_tab.tlb
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame'
+        # For chrome_tab.h
+        '<(SHARED_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)'
           ],
           'sources': [
@@ skipping 162 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],
         },
       ],
     }, ],  # 'coverage!=0'
   ],  # 'conditions'
 }