Correct Chrome Frame dependencies such that a) CF tests depend on the CF DLL ...

chrome_frame/chrome_frame.gyp

Index: chrome_frame/chrome_frame.gyp
===================================================================
--- chrome_frame/chrome_frame.gyp	(revision 35715)
+++ chrome_frame/chrome_frame.gyp	(working copy)
@@ -172,6 +172,7 @@
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
         'chrome_frame_npapi',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
@@ -249,6 +250,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
@@ -309,6 +311,7 @@
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         'chrome_frame_npapi',
+        'npchrome_frame',
       ],
       'sources': [
         '../net/url_request/url_request_unittest.cc',
@@ -607,12 +610,6 @@
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../build/temp_gyp/googleurl.gyp:googleurl',
-        # FIXME(slightlyoff):
-        #   gigantic hack to get these to build from main Chrome sln.
-        'chrome_frame_perftests',
-        'chrome_frame_tests',
-        'chrome_frame_unittests',
-        'chrome_frame_net_tests',
       ],
       'sources': [
         'chrome_frame_npapi.rgs',