Merge 75704 - Fix for the chrome frame anchor url navigation test failures. F...

chrome_frame/chrome_active_document.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Implementation of ChromeActiveDocument
 #include "chrome_frame/chrome_active_document.h"
 
 #include <hlink.h>
 #include <htiface.h>
 #include <initguid.h>
@@ skipping 230 matching lines @@
   NavigationManager* mgr = NavigationManager::GetThreadInstance();
   DLOG_IF(ERROR, !mgr) << "Couldn't get instance of NavigationManager";
 
   std::wstring url;
 
   ScopedComPtr<BindContextInfo> info;
   BindContextInfo::FromBindContext(bind_context, info.Receive());
   DCHECK(info);
   if (info && !info->GetUrl().empty()) {
     url = info->GetUrl();
+    if (mgr) {
+      // If the original URL contains an anchor, then the URL queried
+      // from the protocol sink wrapper does not contain the anchor. To
+      // workaround this we retrieve the anchor from the navigation manager
+      // and append it to the url retrieved from the protocol sink wrapper.
+      GURL url_for_anchor(mgr->url());
+      if (url_for_anchor.has_ref()) {
+        url += L"#";
+        url += UTF8ToWide(url_for_anchor.ref());
+      }
+    }
   } else {
     // If the original URL contains an anchor, then the URL queried
     // from the moniker does not contain the anchor. To workaround
     // this we retrieve the URL from our BHO.
     url = GetActualUrlFromMoniker(moniker_name, bind_context,
                                   mgr ? mgr->url(): std::wstring());
   }
 
   ChromeFrameUrl cf_url;
   if (!cf_url.Parse(url)) {
@@ skipping 1129 matching lines @@
     return true;
 
   if (new_navigation_info.url != navigation_info_.url)
     return true;
 
   if (new_navigation_info.referrer != navigation_info_.referrer)
     return true;
 
   return false;
 }