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

chrome_frame/chrome_frame.gyp

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     'xul_sdk_dir': '../third_party/xulrunner-sdk/<(OS)',
 
     # Keep the archive builder happy.
@@ skipping 154 matching lines @@
       'dependencies': [
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
         'chrome_frame_npapi',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
         '../base/test_suite.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/chrome_frame_automation_mock.cc',
         'test/chrome_frame_automation_mock.h',
         'test/chrome_frame_unittests.cc',
         'test/chrome_frame_unittests.h',
@@ skipping 57 matching lines @@
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../chrome/chrome.gyp:common',
         '../chrome/chrome.gyp:utility',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/libxslt/libxslt.gyp:libxslt',
         'chrome_frame_strings',
+        'npchrome_frame',
         'xulrunner_sdk',
       ],
       'sources': [
         '../base/perf_test_suite.h',
         '../base/perftimer.cc',
         '../base/test/test_file_util.h',
         '../chrome/test/chrome_process_util.cc',
         '../chrome/test/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
         'chrome_tab.h',
@@ skipping 40 matching lines @@
         '../chrome/chrome.gyp:chrome_dll_version',
         '../chrome/chrome.gyp:chrome_resources',
         '../chrome/chrome.gyp:debugger',
         '../chrome/chrome.gyp:renderer',
         '../chrome/chrome.gyp:syncapi',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         '../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',
         '../net/url_request/url_request_unittest.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/test_server.cc',
         'test/test_server.h',
         'test/net/dialog_watchdog.cc',
         'test/net/dialog_watchdog.h',
@@ skipping 278 matching lines @@
       'dependencies': [
         'base_noicu',
         'chrome_frame_ie',
         'chrome_frame_npapi',
         'chrome_frame_strings',
         'chrome_launcher',
         'xulrunner_sdk',
         '../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',
         'chrome_frame_npapi_entrypoints.cc',
         'chrome_tab.cc',
         'chrome_tab.def',
         'chrome_tab.h',
         'chrome_tab.idl',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
@@ skipping 77 matching lines @@
   ],
 }
 
 # vim: shiftwidth=2:et:ai:tabstop=2
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: