summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/urlmon_moniker_unittest.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 01:38:48 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-16 01:38:48 +0000
commitde5bc35e8c0835ba223c3ffcda1099e50f708274 (patch)
tree0f86654a822ed93e8bfecc7097233b2ff1d0d37a /chrome_frame/test/urlmon_moniker_unittest.cc
parent6ee88534895ff56a131400acfd2a837824ef1ead (diff)
downloadchromium_src-de5bc35e8c0835ba223c3ffcda1099e50f708274.zip
chromium_src-de5bc35e8c0835ba223c3ffcda1099e50f708274.tar.gz
chromium_src-de5bc35e8c0835ba223c3ffcda1099e50f708274.tar.bz2
With the ChromeFrame moniker patch on, the data cache maintained to indicate whether we should switch to Chrome, was not being
drained correctly to the delegate, resulting in the delegate continuing to wait for more data when there was none. This caused sites like go/wave to not redirect correctly to CF. Fixes bug http://code.google.com/p/chromium/issues/detail?id=41365 Bug=41365 Review URL: http://codereview.chromium.org/1637017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/urlmon_moniker_unittest.cc')
-rw-r--r--chrome_frame/test/urlmon_moniker_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/test/urlmon_moniker_unittest.cc b/chrome_frame/test/urlmon_moniker_unittest.cc
index f50bd86..ba1b132 100644
--- a/chrome_frame/test/urlmon_moniker_unittest.cc
+++ b/chrome_frame/test/urlmon_moniker_unittest.cc
@@ -74,7 +74,7 @@ TEST_F(MonikerPatchTest, CacheStream) {
// Test 2: Read from initialized cache
CComObjectStackEx<CacheStream> cache_stream2;
- cache_stream2.Initialize(data, sizeof(data));
+ cache_stream2.Initialize(data, sizeof(data), false);
EXPECT_HRESULT_SUCCEEDED(cache_stream2.Read(ret, sizeof(ret), &read));
EXPECT_EQ(sizeof(data), read);
EXPECT_EQ(std::string(data), std::string(ret));
@@ -112,7 +112,7 @@ TEST_F(MonikerPatchTest, BSCBFeedData) {
Return(S_OK)));
EXPECT_HRESULT_SUCCEEDED(CacheStream::BSCBFeedData(&mock, data, size, cf,
- flags));
+ flags, false));
EXPECT_HRESULT_SUCCEEDED(ret1);
EXPECT_STREQ(data, read_buffer1);