When Chrome hands off a URL to be opened by the external host by the ViewHostMsg_OpenURL IPC, it

needs to pass the referrer as well. The Chrome fixes in this CL are mostly related to passing the
HTTP referer off to the browser and from there to the ExternalTabContainer to ChromeFrame and back.

The ChromeFrame changes are basically around the same lines with one exception. When we handle the
AutomationMsg_OpenURL IPC in the activex and the active document we pass the referer if applicable
to the WebBrowser2::Navigate2 interface, which is then read by the BHO in BeforeNavigate2. We then
save away an AddRef'ed BHO pointer in TLS which is then referenced by the Active document for reading
the referer and passing it off to Chrome in the NavigateInExternalTab message.

Added a unit test in ChromeFrame which tests this case.

This fixes http://code.google.com/p/chromium/issues/detail?id=22994

Bug=22994

Review URL: http://codereview.chromium.org/274071

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29420 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 5 deletions

diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc
index 104f2c3..7793f1a 100644
--- a/chrome_frame/chrome_frame_automation.cc
+++ b/chrome_frame/chrome_frame_automation.cc
@@ -483,8 +483,8 @@ void ChromeFrameAutomationClient::Uninitialize() {
   init_state_ = UNINITIALIZED;
 }
 
-bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url,
-                                                     bool is_privileged) {
+bool ChromeFrameAutomationClient::InitiateNavigation(
+    const std::string& url, const std::string& referrer, bool is_privileged) {
   if (url.empty())
     return false;
 
@@ -498,7 +498,7 @@ bool ChromeFrameAutomationClient::InitiateNavigation(const std::string& url,
   }
 
   if (is_initialized()) {
-    BeginNavigate(GURL(url));
+    BeginNavigate(GURL(url), GURL(referrer));
   }
 
   return true;
@@ -538,7 +538,8 @@ bool ChromeFrameAutomationClient::SetProxySettings(
   return true;
 }
 
-void ChromeFrameAutomationClient::BeginNavigate(const GURL& url) {
+void ChromeFrameAutomationClient::BeginNavigate(const GURL& url,
+                                                const GURL& referrer) {
   // Could be NULL if we failed to launch Chrome in LaunchAutomationServer()
   if (!automation_server_ || !tab_.get()) {
     DLOG(WARNING) << "BeginNavigate - can't navigate.";
@@ -554,7 +555,8 @@ void ChromeFrameAutomationClient::BeginNavigate(const GURL& url) {
   }
 
   IPC::SyncMessage* msg =
-      new AutomationMsg_NavigateInExternalTab(0, tab_->handle(), url, NULL);
+      new AutomationMsg_NavigateInExternalTab(0, tab_->handle(), url,
+                                              referrer, NULL);
   automation_server_->SendAsAsync(msg, NewCallback(this,
       &ChromeFrameAutomationClient::BeginNavigateCompleted), this);