Chrome Frame GYP file cleanup.

chrome_frame/chrome_frame.gyp

Index: chrome_frame/chrome_frame.gyp
===================================================================
--- chrome_frame/chrome_frame.gyp	(revision 53040)
+++ chrome_frame/chrome_frame.gyp	(working copy)
@@ -218,8 +218,6 @@
       ],
       'sources': [
         '../base/test_suite.h',
-        'bind_context_info.cc',
-        'bind_context_info.h',
         'test/automation_client_mock.cc',
         'test/automation_client_mock.h',
         'test/chrome_frame_test_utils.cc',
@@ -250,28 +248,10 @@
         'test/url_request_test.cc',
         'test/window_watchdog.cc',
         'test/window_watchdog.h',
-        'chrome_frame_automation.cc',
-        'chrome_frame_histograms.h',
-        'chrome_frame_histograms.cc',
         'chrome_tab.h',
         'chrome_tab.idl',
-        'com_message_event.cc',
-        'custom_sync_call_context.h',        
-        'html_utils.cc',
-        'http_negotiate.h',
-        'http_negotiate.cc',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
         'test_utils.cc',
         'test_utils.h',
-        'urlmon_upload_data_stream.h',
-        'urlmon_upload_data_stream.cc',
-        'urlmon_url_request.h',
-        'urlmon_url_request.cc',
-        'utils.cc',
-        'utils.h',
-        'vtable_patch_manager.h',
-        'vtable_patch_manager.cc'
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
@@ -327,7 +307,6 @@
         '../chrome/test/ui/ui_test.cc',
         'chrome_tab.h',
         'chrome_tab.idl',
-        'html_utils.cc',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
@@ -340,8 +319,6 @@
         'test_utils.h',
         'test/window_watchdog.cc',
         'test/window_watchdog.h',
-        'utils.cc',
-        'utils.h',
       ],
       'include_dirs': [
         '<@(xul_include_directories)',
@@ -495,24 +472,17 @@
       'target_name': 'chrome_frame_npapi',
       'type': 'static_library',
       'dependencies': [
+        'chrome_frame_common',
         'chrome_frame_strings',
         'chrome_frame_utils',
         '../chrome/chrome.gyp:common',
         'xulrunner_sdk',
       ],
       'sources': [
-        'chrome_frame_automation.cc',
-        'chrome_frame_automation.h',
-        'chrome_frame_delegate.cc',
-        'chrome_frame_delegate.h',
-        'chrome_frame_plugin.h',
         'chrome_frame_npapi.cc',
         'chrome_frame_npapi.h',
-        'custom_sync_call_context.h',
         'ff_30_privilege_check.cc',
         'ff_privilege_check.h',
-        'html_utils.cc',
-        'html_utils.h',
         'np_browser_functions.cc',
         'np_browser_functions.h',
         'np_event_listener.cc',
@@ -525,13 +495,7 @@
         'npapi_url_request.h',
         'ns_associate_iid_win.h',
         'ns_isupports_impl.h',
-        'plugin_url_request.cc',
-        'plugin_url_request.h',
         'scoped_ns_ptr_win.h',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
-        'utils.cc',
-        'utils.h',
       ],
     },
     {
@@ -590,6 +554,7 @@
       'target_name': 'chrome_frame_ie',
       'type': 'static_library',
       'dependencies': [
+        'chrome_frame_common',
         'chrome_frame_strings',
         'chrome_frame_utils',
         '../chrome/chrome.gyp:common',
@@ -615,10 +580,6 @@
         'chrome_frame_activex_base.h',
         'chrome_frame_histograms.cc',
         'chrome_frame_histograms.h',
-        'chrome_frame_reporting.cc',
-        'chrome_frame_reporting.h',
-        'chrome_launcher_utils.cc',
-        'chrome_launcher_utils.h',
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
@@ -635,9 +596,11 @@
         'exception_barrier_lowlevel.asm',
         'find_dialog.cc',
         'find_dialog.h',
+        'function_stub.cc',
         'function_stub.h',
+        'html_utils.h',
+        'html_utils.cc',
         'http_negotiate.cc',
-        'function_stub.cc',
         'http_negotiate.h',
         'iids.cc',
         'in_place_menu.h',
@@ -651,8 +614,6 @@
         'register_bho.rgs',
         'stream_impl.cc',
         'stream_impl.h',
-        'sync_msg_reply_dispatcher.cc',
-        'sync_msg_reply_dispatcher.h',
         'extra_system_apis.h',
         'urlmon_bind_status_callback.h',
         'urlmon_bind_status_callback.cc',
@@ -663,6 +624,8 @@
         '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',
       ],
@@ -721,6 +684,24 @@
       },
     },
     {
+      'target_name': 'chrome_frame_common',
+      'type': 'static_library',
+      'sources': [
+        'chrome_frame_automation.h',
+        'chrome_frame_automation.cc',
+        'chrome_frame_delegate.h',
+        'chrome_frame_delegate.cc',
+        'chrome_frame_plugin.h',
+        'chrome_launcher_utils.cc',
+        'chrome_launcher_utils.h',
+        'custom_sync_call_context.h',
+        'plugin_url_request.h',
+        'plugin_url_request.cc',
+        'sync_msg_reply_dispatcher.h',
+        'sync_msg_reply_dispatcher.cc',
+      ]
+    },
+    {
       'target_name': 'npchrome_frame',
       'type': 'shared_library',
       'msvs_guid': 'E3DE7E63-D3B6-4A9F-BCC4-5C8169E9C9F2',
@@ -742,6 +723,8 @@
         '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',