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

16 files changed, 43 insertions, 22 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index 2f0e6d0..156d6a5 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -206,6 +206,7 @@
         'gfx/gl/gl_context_stub.cc',
         'gfx/gl/gl_context_stub.h',
         'gfx/gl/gl_context_win.cc',
+        'gfx/gl/gl_headers.h',
         'gfx/gl/gl_implementation.cc',
         'gfx/gl/gl_implementation.h',
         'gfx/gl/gl_implementation_linux.cc',
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 9eb96de..87b4127 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -133,6 +133,7 @@
         '<(tcmalloc_dir)/src/stack_trace_table.cc',
         '<(tcmalloc_dir)/src/stack_trace_table.h',
         '<(tcmalloc_dir)/src/stacktrace.cc',
+        '<(tcmalloc_dir)/src/stacktrace.h',
         '<(tcmalloc_dir)/src/stacktrace_config.h',
         '<(tcmalloc_dir)/src/stacktrace_generic-inl.h',
         '<(tcmalloc_dir)/src/stacktrace_libunwind-inl.h',
diff --git a/base/base.gypi b/base/base.gypi
index aee11f5..53ee010 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -98,6 +98,7 @@
           'lazy_instance.h',
           'linked_list.h',
           'linked_ptr.h',
+          'lock.h',
           'logging.cc',
           'logging.h',
           'logging_win.cc',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 50f88d1..e0f7c0c4 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -18,9 +18,9 @@
         '../ppapi/ppapi.gyp:ppapi_proxy',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
+        '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/cld/cld.gyp:cld',
         '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-        '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/npapi/npapi.gyp:npapi',
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',
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index c1e7da6..d357e88 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -152,7 +152,8 @@
         'chrome_frame_helper_util.cc',
         'chrome_frame_helper_util.h',
         'chrome_frame_helper_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        'chrome_tab.h',
+        'chrome_tab.idl',
         'event_hooker.cc',
         'event_hooker.h',
         'iids.cc',
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 3a4805f..dd22658 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -9,7 +9,7 @@
     # with extra parameter checking. Once with no parameter checking to be 100%
     # OpenGL ES 2.0 compliant for the conformance tests.
     'gles2_c_lib_source_files': [
-      'command_buffer/client/gles2_lib.h',
+      'command_buffer/client/gles2_c_lib.h',
       'command_buffer/client/gles2_c_lib.cc',
       'command_buffer/client/gles2_c_lib_autogen.h',
     ],
diff --git a/net/net.gyp b/net/net.gyp
index 5ffda1b..a181564 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -66,6 +66,7 @@
         'base/dnssec_chain_verifier.h',
         'base/dnssec_keyset.cc',
         'base/dnssec_keyset.h',
+        'base/dnssec_proto.h',
         'base/dns_util.cc',
         'base/dns_util.h',
         'base/dnsrr_resolver.cc',
@@ -872,6 +873,7 @@
         'base/host_mapping_rules_unittest.cc',
         'base/host_resolver_impl_unittest.cc',
         'base/keygen_handler_unittest.cc',
+        'base/leak_annotations.h',
         'base/listen_socket_unittest.cc',
         'base/listen_socket_unittest.h',
         'base/mapped_host_resolver_unittest.cc',
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index b297172..0f0ce91 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -371,8 +371,10 @@
         'protocol/connection_to_client.h',
         'protocol/connection_to_host.cc',
         'protocol/connection_to_host.h',
+        'protocol/host_control_message_handler.h',
         'protocol/host_control_sender.cc',
         'protocol/host_control_sender.h',
+        'protocol/host_event_message_handler.h',
         'protocol/host_message_dispatcher.cc',
         'protocol/host_message_dispatcher.h',
         'protocol/host_stub.h',
diff --git a/skia/skia.gyp b/skia/skia.gyp
index b486647..ff6b8e8 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -269,6 +269,7 @@
         '../third_party/skia/src/core/SkBitmapShaderTemplate.h',
         '../third_party/skia/src/core/SkBitmap_scroll.cpp',
         '../third_party/skia/src/core/SkBlitBWMaskTemplate.h',
+        '../third_party/skia/src/core/SkBlitRow.h',
         '../third_party/skia/src/core/SkBlitRow_D16.cpp',
         '../third_party/skia/src/core/SkBlitRow_D32.cpp',
         '../third_party/skia/src/core/SkBlitRow_D4444.cpp',
@@ -371,7 +372,6 @@
         '../third_party/skia/src/core/SkStroke.cpp',
         '../third_party/skia/src/core/SkStrokerPriv.cpp',
         '../third_party/skia/src/core/SkStrokerPriv.h',
-        '../third_party/skia/src/core/SkTextFormatParams.h',
         '../third_party/skia/src/core/SkTSearch.cpp',
         '../third_party/skia/src/core/SkTSort.h',
         '../third_party/skia/src/core/SkTemplatesPriv.h',
@@ -477,12 +477,12 @@
         '../third_party/skia/src/ports/sk_predefined_gamma.h',
 
         '../third_party/skia/src/include/utils/mac/SkCGUtils.h',
+        '../third_party/skia/src/include/utils/SkTextFormatParams.h',
         '../third_party/skia/src/utils/mac/SkCreateCGImageRef.cpp',
 
         '../third_party/skia/include/core/Sk64.h',
         '../third_party/skia/include/core/SkAutoKern.h',
         '../third_party/skia/include/core/SkBitmap.h',
-        '../third_party/skia/include/core/SkBlitRow.h',
         '../third_party/skia/include/core/SkBlitter.h',
         '../third_party/skia/include/core/SkBounder.h',
         '../third_party/skia/include/core/SkBuffer.h',
@@ -500,7 +500,7 @@
         '../third_party/skia/include/core/SkDraw.h',
         '../third_party/skia/include/core/SkDrawFilter.h',
         '../third_party/skia/include/core/SkDrawLooper.h',
-        #'../third_party/skia/include/core/SkDrawing.h',
+        '../third_party/skia/include/core/SkDrawing.h',
         '../third_party/skia/include/core/SkEndian.h',
         '../third_party/skia/include/core/SkFDot6.h',
         '../third_party/skia/include/core/SkFixed.h',
@@ -528,6 +528,7 @@
         '../third_party/skia/include/core/SkPicture.h',
         '../third_party/skia/include/core/SkPixelRef.h',
         '../third_party/skia/include/core/SkPoint.h',
+        '../third_party/skia/include/core/SkPorterDuff.h',
         '../third_party/skia/include/core/SkPtrRecorder.h',
         '../third_party/skia/include/core/SkRandom.h',
         '../third_party/skia/include/core/SkRasterizer.h',
@@ -578,9 +579,9 @@
         '../third_party/skia/include/effects/SkKernel33MaskFilter.h',
         '../third_party/skia/include/effects/SkLayerDrawLooper.h',
         '../third_party/skia/include/effects/SkLayerRasterizer.h',
+        '../third_party/skia/include/effects/SkNWayCanvas.h',
         '../third_party/skia/include/effects/SkPaintFlagsDrawFilter.h',
         '../third_party/skia/include/effects/SkPixelXorXfermode.h',
-        '../third_party/skia/include/effects/SkPorterDuff.h',
         '../third_party/skia/include/effects/SkTransparentShader.h',
 
         '../third_party/skia/include/gpu/SkGpuCanvas.h',
diff --git a/third_party/cacheinvalidation/cacheinvalidation.gyp b/third_party/cacheinvalidation/cacheinvalidation.gyp
index 8bff843..0f26cd3 100644
--- a/third_party/cacheinvalidation/cacheinvalidation.gyp
+++ b/third_party/cacheinvalidation/cacheinvalidation.gyp
@@ -81,8 +81,8 @@
         'overrides/google/cacheinvalidation/mutex.h',
         'overrides/google/cacheinvalidation/random.h',
         'overrides/google/cacheinvalidation/scoped_ptr.h',
-        'overrides/google/cacheinvalidation/stl-namespace.h',
-        'overrides/google/cacheinvalidation/string_util.h',
+        'overrides/google/cacheinvalidation/stl-namespace.h'
+        'overrides/google/cacheinvalidation/string_util.h'
         'overrides/google/cacheinvalidation/time.h',
         'files/src/google/cacheinvalidation/invalidation-client-impl.cc',
         'files/src/google/cacheinvalidation/invalidation-client-impl.h',
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 16b9d11..0c68ec6 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -150,6 +150,7 @@
         'overrides/talk/xmllite/qname.cc',
         'overrides/talk/xmllite/qname.h',
 
+        'source/talk/base/DiskCacheStd.h',
         'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
         'source/talk/base/asyncfile.cc',
         'source/talk/base/asyncfile.h',
@@ -181,6 +182,7 @@
         'source/talk/base/diskcache.h',
         'source/talk/base/event.cc',
         'source/talk/base/event.h',
+        'source/talk/base/fakenetwork.h',
         'source/talk/base/fileutils.cc',
         'source/talk/base/fileutils.h',
         'source/talk/base/fileutils_mock.h',
@@ -188,6 +190,7 @@
         'source/talk/base/firewallsocketserver.h',
         'source/talk/base/flags.cc',
         'source/talk/base/flags.h',
+        'source/talk/base/hash.h',
         'source/talk/base/helpers.cc',
         'source/talk/base/helpers.h',
         'source/talk/base/host.cc',
@@ -210,6 +213,7 @@
         'source/talk/base/messagehandler.h',
         'source/talk/base/messagequeue.cc',
         'source/talk/base/messagequeue.h',
+        'source/talk/base/netfw.h',
         'source/talk/base/nethelpers.cc',
         'source/talk/base/nethelpers.h',
         'source/talk/base/network.cc',
@@ -308,6 +312,7 @@
         ['OS=="win"', {
           'sources': [
             'overrides/talk/base/win32socketinit.cc',
+            'source/talk/base/convert.h',  # win32 only
             'source/talk/base/schanneladapter.cc',
             'source/talk/base/schanneladapter.h',
             'source/talk/base/win32.h',
diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index de0d329..6371628 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -94,6 +94,8 @@
             'src/include/libxml/xpointer.h',
             'src/include/win32config.h',
             'src/include/wsockcompat.h',
+            'src/win32/config.h',
+            'src/win32/include/libxml/xmlversion.h',
             'src/acconfig.h',
             'src/c14n.c',
             'src/catalog.c',
@@ -148,8 +150,6 @@
             'src/xmlwriter.c',
             'src/xpath.c',
             'src/xpointer.c',
-            'win32/config.h',
-            'win32/include/libxml/xmlversion.h',
           ],
           'defines': [
             # Define LIBXML_STATIC as nothing to match how libxml.h
diff --git a/third_party/protobuf/protobuf.gyp b/third_party/protobuf/protobuf.gyp
index bafc344..6833ca5 100644
--- a/third_party/protobuf/protobuf.gyp
+++ b/third_party/protobuf/protobuf.gyp
@@ -112,6 +112,7 @@
         'src/google/protobuf/text_format.h',
         'src/google/protobuf/unknown_field_set.h',
         'src/google/protobuf/wire_format.h',
+        'src/google/protobuf/wire_format_inl.h',
         'src/google/protobuf/io/gzip_stream.h',
         'src/google/protobuf/io/printer.h',
         'src/google/protobuf/io/tokenizer.h',
diff --git a/views/views.gyp b/views/views.gyp
index e38cde8..ca7c6ff 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -154,6 +154,7 @@
         'controls/menu/menu_separator_gtk.cc',
         'controls/menu/menu_separator_gtk.h',
         'controls/menu/menu_separator_win.cc',
+        'controls/menu/menu_separator_win.h',
         'controls/menu/menu_win.cc',
         'controls/menu/menu_win.h',
         'controls/menu/menu_wrapper.h',
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index 2de3fbc..eec99bf 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -192,6 +192,7 @@
         '../plugins/npapi/gtk_plugin_container_manager.h',
         '../plugins/npapi/npapi_extension_thunk.cc',
         '../plugins/npapi/npapi_extension_thunk.h',
+        '../plugins/npapi/nphostapi.h',
         '../plugins/npapi/plugin_constants_win.cc',
         '../plugins/npapi/plugin_constants_win.h',
         '../plugins/npapi/plugin_group.cc',
@@ -221,6 +222,7 @@
         '../plugins/npapi/plugin_string_stream.h',
         '../plugins/npapi/plugin_web_event_converter_mac.h',
         '../plugins/npapi/plugin_web_event_converter_mac.mm',
+        '../plugins/npapi/ppb_private.h',
         '../plugins/npapi/quickdraw_drawing_manager_mac.cc',
         '../plugins/npapi/quickdraw_drawing_manager_mac.h',
         '../plugins/npapi/webplugin.cc',