Merge 75656 - If we switch into ChromeFrame as a result of a redirect then we...

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 228 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->url().empty()) {
-    url = info->url();
+  if (info && !info->GetUrl().empty()) {
+    url = info->GetUrl();
   } 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;
 }