diff options
| author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 21:08:16 +0000 |
|---|---|---|
| committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-21 21:08:16 +0000 |
| commit | cd3aa9812ec3c0161f1acc3b8ee76ea2d3c2239b (patch) | |
| tree | ce48de4691b686ef82f02d7ce4e26210ca3730f4 /chrome_frame/chrome_frame.gyp | |
| parent | 4f4fdf1ab3b4cc2d7d223830723d56a5692b75c2 (diff) | |
| download | chromium_src-cd3aa9812ec3c0161f1acc3b8ee76ea2d3c2239b.zip chromium_src-cd3aa9812ec3c0161f1acc3b8ee76ea2d3c2239b.tar.gz chromium_src-cd3aa9812ec3c0161f1acc3b8ee76ea2d3c2239b.tar.bz2 | |
Revert 60084 - A test for Chrome Frame delete browser history behaviour in IE8.
BUG=52612
TEST=chrome_frame_tests --gtest_filter=DeleteBrowsingHistoryTest.*
Review URL: http://codereview.chromium.org/3365010/show
TBR=erikwright@chromium.org
Review URL: http://codereview.chromium.org/3487002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60100 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 8f3d62e..3560f7f 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -226,9 +226,6 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', - '../chrome/chrome.gyp:browser', - '../chrome/chrome.gyp:debugger', - '../chrome/chrome.gyp:renderer', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -236,7 +233,7 @@ 'chrome_frame_ie', 'chrome_frame_npapi', 'chrome_frame_strings', - 'npchrome_frame', + 'npchrome_frame', 'xulrunner_sdk', ], 'sources': [ @@ -249,7 +246,6 @@ 'test/chrome_frame_ui_test_utils.h', 'test/chrome_frame_automation_mock.cc', 'test/chrome_frame_automation_mock.h', - 'test/delete_chrome_history_test.cc', 'test/http_server.cc', 'test/http_server.h', 'test/ie_event_sink.cc', @@ -276,6 +272,7 @@ 'test/win_event_receiver.h', 'chrome_tab.h', 'chrome_tab.idl', + 'renderer_glue.cc', 'test_utils.cc', 'test_utils.h', ], @@ -305,23 +302,7 @@ '../chrome/chrome.gyp:automation', '../chrome/chrome.gyp:installer_util', '../google_update/google_update.gyp:google_update', - ], - 'configurations': { - 'Debug_Base': { - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', - }, - }, - }, - }, - 'conditions': [ - ['win_use_allocator_shim==1', { - 'dependencies': [ - '../base/allocator/allocator.gyp:allocator', - ], - }], - ], + ] }], ], }, |