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

Correct Chrome Frame dependencies such that a) CF tests depend on the CF DLL b) all.gyp:chromium_builder will build CF stuff.

BUG=CF dll and chrome_launcher.exe were not getting built on the chromium-rel builder.
TEST=No more BUG.

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

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

build/all.gyp

@@ -218,12 +218,16 @@
             # 2) be expressed in the ui tests dependencies.
             '../webkit/tools/test_shell/test_shell.gyp:test_shell_common',
             'temp_gyp/googleurl.gyp:googleurl_unittests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
             '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
-            '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
+            '../chrome_frame/chrome_frame.gyp:npchrome_frame',
           ],
         },
         {
+          # TODO(robertshield): Remove this target once the last independent
+          # CF builder is retired.
           'target_name': 'chrome_frame_builder',
           'type': 'none',
           'dependencies': [

chrome_frame/chrome_frame.gyp

@@ -176,6 +176,7 @@
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
         'chrome_frame_npapi',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
@@ -253,6 +254,7 @@
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
@@ -313,6 +315,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',
@@ -611,12 +614,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',