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

1 files changed, 1 insertions, 24 deletions

diff --git a/chrome_frame/urlmon_url_request.h b/chrome_frame/urlmon_url_request.h
index 0b8898e..5dbb417 100644
--- a/chrome_frame/urlmon_url_request.h
+++ b/chrome_frame/urlmon_url_request.h
@@ -104,30 +104,7 @@ class UrlmonUrlRequestManager
   typedef std::map<int, scoped_refptr<UrlmonUrlRequest> > RequestMap;
   RequestMap request_map_;
   scoped_refptr<UrlmonUrlRequest> LookupRequest(int request_id);
-
-  struct UrlInfo {
-    void Clear() {
-      url_ = GURL::EmptyGURL();
-      bind_ctx_.Release();
-      moniker_.Release();
-    }
-
-    void Set(const std::wstring& url, IMoniker* moniker, LPBC bc) {
-      DCHECK(bind_ctx_.get() == NULL);
-      DCHECK(moniker_.get() == NULL);
-      url_ = GURL(url);
-      moniker_ = moniker;
-      bind_ctx_ = bc;
-    }
-
-    bool IsForUrl(const std::string& url) {
-      return GURL(url) == url_;
-    }
-
-    GURL url_;
-    ScopedComPtr<IBindCtx> bind_ctx_;
-    ScopedComPtr<IMoniker> moniker_;
-  } url_info_;
+  scoped_refptr<UrlmonUrlRequest> pending_request_;
 
   bool stopping_;
   int calling_delegate_;  // re-entrancy protection (debug only check)