summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/test_with_web_server.cc
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 00:35:52 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-14 00:35:52 +0000
commit3ee6112cc9d368ccd11d2cc2eea4f3aca2fd4400 (patch)
treef4b1f729762acbdd4ee3903f0b29d04f77b1b952 /chrome_frame/test/test_with_web_server.cc
parent72eb2da638af5bcb4830827eeb1edebb580e36b1 (diff)
downloadchromium_src-3ee6112cc9d368ccd11d2cc2eea4f3aca2fd4400.zip
chromium_src-3ee6112cc9d368ccd11d2cc2eea4f3aca2fd4400.tar.gz
chromium_src-3ee6112cc9d368ccd11d2cc2eea4f3aca2fd4400.tar.bz2
Fix for remaining major issues with moniker patch
This patch fixes things so that they now work 'naturally', i.e switch to chrome frame looks just like switching to pdf. The same bind context and underlying network transaction objects are used and requests aren't sent multiple times. Finally the TestPostReissue test is happy! This patch fixes two issues with earlier scheme: Issue 1: data can be read only once from a given bind context. Mshtml looks at the mime type in the FORMATETC but never issues a read. So when it switches, the new active document can read from start. Since we are reading the data for switching, when we actually switch, we have to transfer over the data read so far to our UrlmonUrlRequest. Issue 2: The very first UrlmomUrlRequest has to start binding right away, in the context of BindToStorage or network transcations associated with the bind context are gone (due to OnStopBinding for BindToObject). TEST=covered by existing tests BUG=33332 Review URL: http://codereview.chromium.org/1508033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test/test_with_web_server.cc')
-rw-r--r--chrome_frame/test/test_with_web_server.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 991efdae..758e07e 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -793,7 +793,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) {
if (!MonikerPatchEnabled())
return;
- MessageLoopForUI loop; // must come before the server.
+ chrome_frame_test::TimedMsgLoop loop; // must come before the server.
// The order of pages in this array is assumed to be mshtml, cf, script.
const wchar_t* kPages[] = {
@@ -807,7 +807,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestPostReissue) {
ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
- loop.MessageLoop::Run();
+ loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
// Check if the last request to /quit gave us the OK signal.
const test_server::Request& r = server.last_request();
@@ -827,7 +827,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
if (!MonikerPatchEnabled())
return;
- MessageLoopForUI loop; // must come before the server.
+ chrome_frame_test::TimedMsgLoop loop; // must come before the server.
// The order of pages in this array is assumed to be mshtml, cf, script.
const wchar_t* kPages[] = {
@@ -841,7 +841,7 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_TestMultipleGet) {
ASSERT_TRUE(LaunchBrowser(IE, server.FormatHttpPath(kPages[0]).c_str()));
- loop.MessageLoop::Run();
+ loop.RunFor(kChromeFrameLongNavigationTimeoutInSeconds);
// Check if the last request to /quit gave us the OK signal.
const test_server::Request& r = server.last_request();