summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 20:55:16 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-30 20:55:16 +0000
commit90b99add1c97e5e6f44208d85a845a14cc4332fb (patch)
tree7a60ea60339559ea8714b60f9f966e23409d935f /chrome_frame
parent3d2736e38f9d0129203b9e255610d7aa35da1c22 (diff)
downloadchromium_src-90b99add1c97e5e6f44208d85a845a14cc4332fb.zip
chromium_src-90b99add1c97e5e6f44208d85a845a14cc4332fb.tar.gz
chromium_src-90b99add1c97e5e6f44208d85a845a14cc4332fb.tar.bz2
Disable the DeleteBrowserHistoryTest. Still doesn't run reliably on the build slave :(
BUG=None TBR=ananta@chromium.org TEST=None git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/delete_chrome_history_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/test/delete_chrome_history_test.cc b/chrome_frame/test/delete_chrome_history_test.cc
index cb8c3de..48bf367 100644
--- a/chrome_frame/test/delete_chrome_history_test.cc
+++ b/chrome_frame/test/delete_chrome_history_test.cc
@@ -166,7 +166,7 @@ class PageLoadHelper {
testing::NiceMock<MockAccEventObserver> acc_observer_;
};
-TEST_F(DeleteBrowsingHistoryTest, CFDeleteBrowsingHistory) {
+TEST_F(DeleteBrowsingHistoryTest, DISABLED_CFDeleteBrowsingHistory) {
if (GetInstalledIEVersion() < IE_8) {
LOG(ERROR) << "Test does not apply to IE versions < 8.";
return;