summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/http_negotiate_unittest.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 02:30:03 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-22 02:30:03 +0000
commit1da35175c66788af1312547ec24d6e36234a0aa5 (patch)
tree43cb77c522b96a5ff903c1808fa1af26c24133ff /chrome_frame/test/http_negotiate_unittest.cc
parentdb00e5d09920f72b7059a0bd2dc3853667a50353 (diff)
downloadchromium_src-1da35175c66788af1312547ec24d6e36234a0aa5.zip
chromium_src-1da35175c66788af1312547ec24d6e36234a0aa5.tar.gz
chromium_src-1da35175c66788af1312547ec24d6e36234a0aa5.tar.bz2
The HttpNegotiateTest.ReportProgress test fails on IE6 as we fail to retrieve the IBrowserService interface.
Disabling this test for IE6 for now. Review URL: http://codereview.chromium.org/1731003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/http_negotiate_unittest.cc')
-rw-r--r--chrome_frame/test/http_negotiate_unittest.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome_frame/test/http_negotiate_unittest.cc b/chrome_frame/test/http_negotiate_unittest.cc
index a8d2228..b203f61 100644
--- a/chrome_frame/test/http_negotiate_unittest.cc
+++ b/chrome_frame/test/http_negotiate_unittest.cc
@@ -10,6 +10,7 @@
#include "base/string_util.h"
#include "chrome_frame/http_negotiate.h"
#include "chrome_frame/html_utils.h"
+#include "chrome_frame/test/chrome_frame_test_utils.h"
#include "chrome_frame/utils.h"
#include "gtest/gtest.h"
#include "gmock/gmock.h"
@@ -183,6 +184,10 @@ END_COM_MAP()
};
TEST_F(HttpNegotiateTest, ReportProgress) {
+ if (chrome_frame_test::GetInstalledIEVersion() == IE_6) {
+ DLOG(INFO) << "Not running test for IE6";
+ return;
+ }
static const int kReportProgressIndex = 4;
CComObjectStackEx<TestInternetProtocolSink> test_sink;
IInternetProtocolSink_ReportProgress_Fn original =