Revert 73121 - Remove obsolete files from 'sources'. This causes needless work on incremental builds in VS2010.

This is breaking clobber builds with this error :
e:\b\build\slave\google-chrome-rel-win\build\src\chrome_frame\iids.cc(6) : fatal error C1083: Cannot open include file: 'chrome_tab.h': No such file or directory


BUG=71130
TEST=Check that Chrome builds.

Review URL: http://codereview.chromium.org/6307018

TBR=jeanluc@chromium.org
Review URL: http://codereview.chromium.org/6347032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73124 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 11 deletions

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index c4eaaed..de69141 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -156,7 +156,7 @@
         'xulrunner_sdk',
       ],
       'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
         'chrome_frame_histograms.h',
         'chrome_frame_histograms.cc',
         'chrome_frame_unittest_main.cc',
@@ -291,7 +291,7 @@
         'npchrome_frame',
       ],
       'sources': [
-        '../base/test/test_suite.h',
+        '../base/test_suite.h',
         'cfproxy_test.cc',
         'external_tab_test.cc',
         'test/automation_client_mock.cc',
@@ -328,7 +328,7 @@
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'chrome_launcher_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
         'test_utils.cc',
         'test_utils.h',
       ],
@@ -409,7 +409,7 @@
         '../chrome/test/chrome_process_util.cc',
         '../chrome/test/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
@@ -502,7 +502,7 @@
         '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_tab.h',
+        'chrome_tab.h',
       ],
       'conditions': [
         ['OS=="win"', {
@@ -571,7 +571,7 @@
         'test/simulate_input.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
         '../base/test/test_file_util_win.cc',
         '../chrome/test/automation/proxy_launcher.cc',
         '../chrome/test/automation/proxy_launcher.h',
@@ -627,7 +627,7 @@
         'npchrome_frame',
       ],
       'sources': [
-        '../base/test/test_suite.h',
+        '../base/test_suite.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_ui_test_utils.cc',
@@ -647,7 +647,8 @@
         'test/test_with_web_server.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
+        'chrome_tab.idl',
         'renderer_glue.cc',
         'test_utils.cc',
         'test_utils.h',
@@ -824,7 +825,7 @@
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
         'com_message_event.cc',
         'com_message_event.h',
         'com_type_info_holder.cc',
@@ -1005,8 +1006,10 @@
         'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chromet_tab.tlb',
+        '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',