4 files changed, 59 insertions, 4 deletions
diff --git a/chrome_frame/test/chrome_frame_automation_mock.h b/chrome_frame/test/chrome_frame_automation_mock.h
index 7678282..c77f41f 100644
--- a/chrome_frame/test/chrome_frame_automation_mock.h
+++ b/chrome_frame/test/chrome_frame_automation_mock.h
@@ -41,7 +41,7 @@ class AutomationMockDelegate
   // Navigate external tab to the specified url through automation
   bool Navigate(const std::string& url) {
     url_ = GURL(url);
-    return automation_client_->InitiateNavigation(url, false);
+    return automation_client_->InitiateNavigation(url, std::string(), false);
   }
 
   // Navigate the external to a 'file://' url for unit test files
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc
index ed8f71d..1675820 100644
--- a/chrome_frame/test/chrome_frame_unittests.cc
+++ b/chrome_frame/test/chrome_frame_unittests.cc
@@ -1101,7 +1101,7 @@ TEST(CFACWithChrome, NavigateOk) {
   EXPECT_CALL(cfd, OnAutomationServerReady())
       .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs(CreateFunctor(
           client.get(), &ChromeFrameAutomationClient::InitiateNavigation,
-          url, false))));
+          url, std::string(), false))));
 
 //  cfd.SetOnNavigationStateChanged();
   EXPECT_CALL(cfd,
@@ -1141,7 +1141,7 @@ TEST(CFACWithChrome, DISABLED_NavigateFailed) {
   EXPECT_CALL(cfd, OnAutomationServerReady())
       .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs(CreateFunctor(
           client.get(), &ChromeFrameAutomationClient::InitiateNavigation,
-          url, false))));
+          url, std::string(), false))));
 
   EXPECT_CALL(cfd,
     OnNavigationStateChanged(testing::_, testing::_))
@@ -1199,7 +1199,7 @@ TEST(CFACWithChrome, UseHostNetworkStack) {
   EXPECT_CALL(cfd, OnAutomationServerReady())
       .WillOnce(testing::IgnoreResult(testing::InvokeWithoutArgs(CreateFunctor(
           client.get(), &ChromeFrameAutomationClient::InitiateNavigation,
-          url, false))));
+          url, std::string(), false))));
 
   EXPECT_CALL(cfd, OnNavigationStateChanged(testing::_, testing::_))
       .Times(testing::AnyNumber());
@@ -1436,6 +1436,11 @@ TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_NavigateOut) {
   SimpleBrowserTest(IE, kNavigateOutPage, L"navigate_out");
 }
 
+const wchar_t kReferrerMainTest[] = L"files/referrer_main.html";
+TEST_F(ChromeFrameTestWithWebServer, FullTabModeIE_ReferrerTest) {
+  SimpleBrowserTest(IE, kReferrerMainTest, L"FullTab_ReferrerTest");
+}
+
 HRESULT LaunchIEAsComServer(IWebBrowser2** web_browser) {
   if (!web_browser)
     return E_INVALIDARG;
diff --git a/chrome_frame/test/data/referrer_frame.html b/chrome_frame/test/data/referrer_frame.html
new file mode 100644
index 0000000..c987a3f
--- /dev/null
+++ b/chrome_frame/test/data/referrer_frame.html
@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <meta http-equiv="x-ua-compatible" content="chrome=1" />
+    <title>ChromeFrame referrer frame</title>
+    <script type="text/javascript"
+        src="chrome_frame_tester_helpers.js"></script>
+
+    <script type="text/javascript">
+      function onLoad() {
+        var referrer_search = /referrer_main.html/;
+        var referrer_pos = document.referrer.search(referrer_search);
+
+        if (referrer_pos != -1) {
+          onSuccess("FullTab_ReferrerTest", 1);
+        } else {
+          onFailure("FullTab_ReferrerTest", 1, "Failed to find referrer");
+        }
+      }
+    </script>
+  </head>
+
+  <body onLoad="onLoad()">
+    ChromeFrame full tab mode referrer test
+  </body>
+</html>
diff --git a/chrome_frame/test/data/referrer_main.html b/chrome_frame/test/data/referrer_main.html
new file mode 100644
index 0000000..ef32143
--- /dev/null
+++ b/chrome_frame/test/data/referrer_main.html
@@ -0,0 +1,25 @@
+<html>
+  <head>
+    <meta http-equiv="x-ua-compatible" content="chrome=1" />
+    <title>ChromeFrame referrer test main</title>
+    <script type="text/javascript"
+        src="chrome_frame_tester_helpers.js"></script>
+
+    <a href="referrer_frame.html">self-link</a>
+
+    <script type="text/javascript">
+      function OpenReferrerFrame() {
+        if (isRunningInMSIE()) {
+          onFailure("FullTab_ReferrerTest", 1, "Failed");
+        } else {
+          document.location.href = "referrer_frame.html";
+        }
+      }
+    </script>
+  </head>
+
+  <body onLoad="setTimeout(OpenReferrerFrame, 100);">
+    ChromeFrame full tab mode referrer test. Verifies that the referrer header
+    is set correctly in navigations initiated by ChromeFrame.
+  </body>
+</html>